ls102xa: Adjust some macros for SD boot on LS1021A QDS board

[u-boot] / include / configs / rk3288_common.h

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index ce7fa75fa216266232a4ca42fafb257ebba51dfa..36408b99e2c9025eaeb9ba891fc25186a93315ad 100644 (file)
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -13,7 +13,6 @@
 #define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE                        0x2000
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_MALLOC_LEN          (32 << 20)
@@ -92,6 +91,27 @@
 
 #ifndef CONFIG_SPL_BUILD
 #include <config_distro_defaults.h>
+
+#define ENV_MEM_LAYOUT_SETTINGS \
+       "scriptaddr=0x00000000\0" \
+       "pxefile_addr_r=0x00100000\0" \
+       "fdt_addr_r=0x01f00000\0" \
+       "kernel_addr_r=0x02000000\0" \
+       "ramdisk_addr_r=0x04000000\0"
+
+/* First try to boot from SD (index 0), then eMMC (index 1 */
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(MMC, mmc, 1)
+
+#include <config_distro_bootcmd.h>
+
+/* Linux fails to load the fdt if it's loaded above 512M on a Rock 2 board, so
+ * limit the fdt reallocation to that */
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       "fdt_high=0x1fffffff\0" \
+       ENV_MEM_LAYOUT_SETTINGS \
+       BOOTENV
 #endif
 
 #endif