|
@@ -166,12 +166,14 @@ unsigned long get_board_ddr_clk(void);
|
|
|
#define QIXIS_LBMAP_DFLTBANK 0x00
|
|
|
#define QIXIS_LBMAP_ALTBANK 0x04
|
|
|
#define QIXIS_LBMAP_NAND 0x09
|
|
|
+#define QIXIS_LBMAP_SD 0x00
|
|
|
#define QIXIS_LBMAP_QSPI 0x0f
|
|
|
#define QIXIS_RST_CTL_RESET 0x31
|
|
|
#define QIXIS_RCFG_CTL_RECONFIG_IDLE 0x20
|
|
|
#define QIXIS_RCFG_CTL_RECONFIG_START 0x21
|
|
|
#define QIXIS_RCFG_CTL_WATCHDOG_ENBLE 0x08
|
|
|
#define QIXIS_RCW_SRC_NAND 0x107
|
|
|
+#define QIXIS_RCW_SRC_SD 0x40
|
|
|
#define QIXIS_RCW_SRC_QSPI 0x62
|
|
|
#define QIXIS_RST_FORCE_MEM 0x01
|
|
|
|
|
@@ -235,6 +237,11 @@ unsigned long get_board_ddr_clk(void);
|
|
|
#define CONFIG_SPL_PAD_TO 0x20000
|
|
|
#define CONFIG_SYS_NAND_U_BOOT_OFFS (256 * 1024)
|
|
|
#define CONFIG_SYS_NAND_U_BOOT_SIZE (640 * 1024)
|
|
|
+#elif defined(CONFIG_SD_BOOT)
|
|
|
+#define CONFIG_ENV_OFFSET 0x200000
|
|
|
+#define CONFIG_ENV_IS_IN_MMC
|
|
|
+#define CONFIG_SYS_MMC_ENV_DEV 0
|
|
|
+#define CONFIG_ENV_SIZE 0x20000
|
|
|
#endif
|
|
|
#else
|
|
|
#define CONFIG_SYS_CSPR0_EXT CONFIG_SYS_NOR0_CSPR_EXT
|
|
@@ -368,6 +375,22 @@ unsigned long get_board_ddr_clk(void);
|
|
|
"esbc_validate 0x580740000;" \
|
|
|
"fsl_mc start mc 0x580a00000" \
|
|
|
" 0x580e00000 \0"
|
|
|
+#elif defined(CONFIG_SD_BOOT)
|
|
|
+#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
|
+ "hwconfig=fsl_ddr:bank_intlv=auto\0" \
|
|
|
+ "loadaddr=0x90100000\0" \
|
|
|
+ "kernel_addr=0x800\0" \
|
|
|
+ "ramdisk_addr=0x800000\0" \
|
|
|
+ "ramdisk_size=0x2000000\0" \
|
|
|
+ "fdt_high=0xa0000000\0" \
|
|
|
+ "initrd_high=0xffffffffffffffff\0" \
|
|
|
+ "kernel_start=0x8000\0" \
|
|
|
+ "kernel_load=0xa0000000\0" \
|
|
|
+ "kernel_size=0x14000\0" \
|
|
|
+ "mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;" \
|
|
|
+ "mmc read 0x80100000 0x7000 0x800;" \
|
|
|
+ "fsl_mc start mc 0x80000000 0x80100000\0" \
|
|
|
+ "mcmemsize=0x70000000 \0"
|
|
|
#else
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
|
"hwconfig=fsl_ddr:bank_intlv=auto\0" \
|
|
@@ -386,7 +409,7 @@ unsigned long get_board_ddr_clk(void);
|
|
|
#endif /* CONFIG_SECURE_BOOT */
|
|
|
|
|
|
|
|
|
-#ifdef CONFIG_FSL_MC_ENET
|
|
|
+#if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD)
|
|
|
#define CONFIG_FSL_MEMAC
|
|
|
#define CONFIG_PHYLIB
|
|
|
#define CONFIG_PHYLIB_10G
|