Move initialization of the PCI and the USB subsystems from the 'preboot'
command to the board's early_init_r() function and then try to detect a
boot device by accessing the MMC0 device. If it works, then set boot
device interface to 'mmc', if not, use 'usb'.
This allows the environment variales to be loaded from the proper
storage interface.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Idf06ba827167479510206587308875c8eedce892
#ifdef CONFIG_ARM64
#include <asm/armv8/mmu.h>
#endif
+#include <usb.h>
#include <watchdog.h>
#include <dm/pinctrl.h>
env_set("serial#", serial_string);
}
+#if defined(CONFIG_PCI) && defined(CONFIG_BOARD_EARLY_INIT_R)
+static char *boot_interface;
+int board_early_init_r(void)
+{
+ /*
+ * Currently there is not way to detect which device (SD card or
+ * USB Mass Storage) has been used by VideoCore to load the uboot,
+ * so just try MMC0 first, if not then use USB.
+ */
+ mmc_init_device(0);
+ boot_interface = (blk_get_dev("mmc", 0)) ? "mmc" : "usb";
+
+ pci_init();
+ usb_init();
+
+ return 0;
+}
+
+char *env_fat_get_interface(void)
+{
+ return boot_interface;
+}
+#endif
+
int misc_init_r(void)
{
set_fdt_addr();