rpi: Add mmc 1 as a boot target

[platform/kernel/u-boot.git] / include / configs / rpi.h

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 649a425..9ce4176 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -39,7 +39,6 @@
 #endif
 
 /* Memory layout */
-#define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
 /*
@@ -66,7 +65,6 @@
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_TFTP_TSIZE
-#define CONFIG_MISC_INIT_R
 #endif
 
 /* Console configuration */
@@ -90,6 +88,14 @@
        "stdout=serial,vidconsole\0" \
        "stderr=serial,vidconsole\0"
 
+#ifdef CONFIG_ARM64
+#define FDT_HIGH "ffffffffffffffff"
+#define INITRD_HIGH "ffffffffffffffff"
+#else
+#define FDT_HIGH "ffffffff"
+#define INITRD_HIGH "ffffffff"
+#endif
+
 /*
  * Memory layout for where various images get loaded by boot scripts:
  *
@@ -132,8 +138,8 @@
  * large initrds before they start colliding with U-Boot.
  */
 #define ENV_MEM_LAYOUT_SETTINGS \
-       "fdt_high=ffffffff\0" \
-       "initrd_high=ffffffff\0" \
+       "fdt_high=" FDT_HIGH "\0" \
+       "initrd_high=" INITRD_HIGH "\0" \
        "kernel_addr_r=0x00080000\0" \
        "scriptaddr=0x02400000\0" \
        "pxefile_addr_r=0x02500000\0" \
@@ -142,6 +148,7 @@
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
+       func(MMC, mmc, 1) \
        func(USB, usb, 0) \
        func(PXE, pxe, na) \
        func(DHCP, dhcp, na)