rpi: use board_early_init_r to init PCI/USB and detect boot device

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

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 2e0e475fd32b7b40a6593811a8d6080453fa2ae8..bc3cc597adbf10cbdcc13aee86851d8d8ff14951 100644 (file)
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -23,6 +23,7 @@
 #ifdef CONFIG_ARM64
 #include <asm/armv8/mmu.h>
 #endif
+#include <usb.h>
 #include <watchdog.h>
 #include <dm/pinctrl.h>
 
@@ -461,6 +462,30 @@ static void set_serial_number(void)
        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();

diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
index c9d4099c4559f6f3a09e053ec991453292aebcf0..54b1e8a54cb56d587e4c72f8c71e763bace293e8 100644 (file)
--- a/configs/rpi_4_32b_defconfig
+++ b/configs/rpi_4_32b_defconfig
@@ -7,11 +7,12 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="pci enum; usb start"
+CONFIG_PREBOOT=""
 CONFIG_SYS_STDIO_DEREGISTER=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
+CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_ASKENV=y

diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
index 46f2bc23447f20d018087f033b29063a28345c58..c9e250089db7bac38b0c9a043b418391e8d476b0 100644 (file)
--- a/configs/rpi_4_defconfig
+++ b/configs/rpi_4_defconfig
@@ -7,11 +7,12 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="pci enum; usb start"
+CONFIG_PREBOOT=""
 CONFIG_SYS_STDIO_DEREGISTER=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
+CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_ASKENV=y