Merge tag 'ti-v2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti

[oweals/u-boot.git] / board / bosch / guardian / board.c

diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index ec0c4a17f635b0306a8f2c45efe014bc4b311cd0..1d8fa781545d1a617a4f84e9522a9ea1925514e1 100644 (file)
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -11,9 +11,12 @@
 #include <common.h>
 #include <cpsw.h>
 #include <dm.h>
+#include <env.h>
 #include <env_internal.h>
 #include <errno.h>
 #include <i2c.h>
+#include <init.h>
+#include <led.h>
 #include <miiphy.h>
 #include <panel.h>
 #include <power/tps65217.h>
@@ -172,14 +175,70 @@ void sdram_init(void)
 
 int board_init(void)
 {
+       save_omap_boot_params();
+
 #if defined(CONFIG_HW_WATCHDOG)
        hw_watchdog_init();
 #endif
 
        gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
        gpmc_init();
 #endif
        return 0;
 }
+
+#ifdef CONFIG_BOARD_LATE_INIT
+static void set_bootmode_env(void)
+{
+       char *boot_device_name = NULL;
+       char *boot_mode_gpio = "gpio@44e07000_14";
+       int   ret;
+       int   value;
+
+       struct gpio_desc boot_mode_desc;
+
+       switch (gd->arch.omap_boot_device) {
+       case BOOT_DEVICE_NAND:
+               boot_device_name = "nand";
+               break;
+       case BOOT_DEVICE_USBETH:
+               boot_device_name = "usbeth";
+               break;
+       default:
+               break;
+       }
+
+       if (boot_device_name)
+               env_set("boot_device", boot_device_name);
+
+       ret = dm_gpio_lookup_name(boot_mode_gpio, &boot_mode_desc);
+       if (ret) {
+               printf("%s is not found\n", boot_mode_gpio);
+               goto err;
+       }
+
+       ret = dm_gpio_request(&boot_mode_desc, "setup_bootmode_env");
+       if (ret && ret != -EBUSY) {
+               printf("requesting gpio: %s failed\n", boot_mode_gpio);
+               goto err;
+       }
+
+       value = dm_gpio_get_value(&boot_mode_desc);
+       value ? env_set("swi_status", "0") : env_set("swi_status", "1");
+       return;
+
+err:
+       env_set("swi_status", "err");
+}
+
+int board_late_init(void)
+{
+#ifdef CONFIG_LED_GPIO
+       led_default_state();
+#endif
+       set_bootmode_env();
+       return 0;
+}
+#endif /* CONFIG_BOARD_LATE_INIT */