Merge branch 'u-boot/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / board / samsung / common / board.c

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index a74b0444362696615976e8c4ae4292409f9232d5..de154e0f648a6a702b41060b1d4a47ed68eb9353 100644 (file)
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -22,16 +22,11 @@
 #include <asm/arch/power.h>
 #include <power/pmic.h>
 #include <asm/arch/sromc.h>
 #include <asm/arch/power.h>
 #include <power/pmic.h>
 #include <asm/arch/sromc.h>

+#include <lcd.h>
+#include <samsung/misc.h>

 
 DECLARE_GLOBAL_DATA_PTR;
 
 
 DECLARE_GLOBAL_DATA_PTR;
 

-struct local_info {
-       struct cros_ec_dev *cros_ec_dev;        /* Pointer to cros_ec device */
-       int cros_ec_err;                        /* Error for cros_ec, 0 if ok */
-};
-
-static struct local_info local;
-

 int __exynos_early_init_f(void)
 {
        return 0;
 int __exynos_early_init_f(void)
 {
        return 0;


@@ -157,22 +152,6 @@ int board_early_init_f(void)
 }
 #endif
 
 }
 #endif
 

-struct cros_ec_dev *board_get_cros_ec_dev(void)
-{
-       return local.cros_ec_dev;
-}
-
-#ifdef CONFIG_CROS_EC
-static int board_init_cros_ec_devices(const void *blob)
-{
-       local.cros_ec_err = cros_ec_init(blob, &local.cros_ec_dev);
-       if (local.cros_ec_err)
-               return -1;  /* Will report in board_late_init() */
-
-       return 0;
-}
-#endif
-

 #if defined(CONFIG_POWER)
 int power_init_board(void)
 {
 #if defined(CONFIG_POWER)
 int power_init_board(void)
 {


@@ -183,6 +162,7 @@ int power_init_board(void)
 #endif
 
 #ifdef CONFIG_OF_CONTROL
 #endif
 
 #ifdef CONFIG_OF_CONTROL

+#ifdef CONFIG_SMC911X

 static int decode_sromc(const void *blob, struct fdt_sromc *config)
 {
        int err;
 static int decode_sromc(const void *blob, struct fdt_sromc *config)
 {
        int err;


@@ -206,6 +186,7 @@ static int decode_sromc(const void *blob, struct fdt_sromc *config)
        }
        return 0;
 }
        }
        return 0;
 }

+#endif

 
 int board_eth_init(bd_t *bis)
 {
 
 int board_eth_init(bd_t *bis)
 {


@@ -263,10 +244,18 @@ int board_mmc_init(bd_t *bis)
 {
        int ret;
 
 {
        int ret;
 

+#ifdef CONFIG_SDHCI
+       /* mmc initializattion for available channels */
+       ret = exynos_mmc_init(gd->fdt_blob);
+       if (ret)
+               debug("mmc init failed\n");
+#endif
+#ifdef CONFIG_DWMMC

        /* dwmmc initializattion for available channels */
        ret = exynos_dwmmc_init(gd->fdt_blob);
        if (ret)
                debug("dwmmc init failed\n");
        /* dwmmc initializattion for available channels */
        ret = exynos_dwmmc_init(gd->fdt_blob);
        if (ret)
                debug("dwmmc init failed\n");

+#endif

 
        return ret;
 }
 
        return ret;
 }


@@ -290,12 +279,12 @@ int board_late_init(void)
 {
        stdio_print_current_devices();
 
 {
        stdio_print_current_devices();
 

-       if (local.cros_ec_err) {
+       if (cros_ec_get_error()) {

                /* Force console on */
                gd->flags &= ~GD_FLG_SILENT;
 
                printf("cros-ec communications failure %d\n",
                /* Force console on */
                gd->flags &= ~GD_FLG_SILENT;
 
                printf("cros-ec communications failure %d\n",

-                      local.cros_ec_err);
+                      cros_ec_get_error());

                puts("\nPlease reset with Power+Refresh\n\n");
                panic("Cannot init cros-ec device");
                return -1;
                puts("\nPlease reset with Power+Refresh\n\n");
                panic("Cannot init cros-ec device");
                return -1;


@@ -307,7 +296,7 @@ int board_late_init(void)
 int arch_early_init_r(void)
 {
 #ifdef CONFIG_CROS_EC
 int arch_early_init_r(void)
 {
 #ifdef CONFIG_CROS_EC

-       if (board_init_cros_ec_devices(gd->fdt_blob)) {
+       if (cros_ec_board_init()) {

                printf("%s: Failed to init EC\n", __func__);
                return 0;
        }
                printf("%s: Failed to init EC\n", __func__);
                return 0;
        }


@@ -315,3 +304,21 @@ int arch_early_init_r(void)
 
        return 0;
 }
 
        return 0;
 }

+
+#ifdef CONFIG_MISC_INIT_R
+int misc_init_r(void)
+{
+#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+       set_board_info();
+#endif
+#ifdef CONFIG_LCD_MENU
+       keys_init();
+       check_boot_mode();
+#endif
+#ifdef CONFIG_CMD_BMP
+       if (panel_info.logo_on)
+               draw_logo();
+#endif
+       return 0;
+}
+#endif