|
@@ -19,11 +19,64 @@
|
|
#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */
|
|
#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */
|
|
|
|
|
|
#ifdef CONFIG_RAMBOOT_PBL
|
|
#ifdef CONFIG_RAMBOOT_PBL
|
|
-#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE
|
|
|
|
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
|
|
|
|
#define CONFIG_SYS_FSL_PBL_PBI board/freescale/t4qds/t4_pbi.cfg
|
|
#define CONFIG_SYS_FSL_PBL_PBI board/freescale/t4qds/t4_pbi.cfg
|
|
#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t4qds/t4_rcw.cfg
|
|
#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t4qds/t4_rcw.cfg
|
|
|
|
+#if !defined(CONFIG_NAND) && !defined(CONFIG_SDCARD)
|
|
|
|
+#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE
|
|
|
|
+#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
|
|
|
|
+#else
|
|
|
|
+#define CONFIG_SPL
|
|
|
|
+#define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
|
|
|
|
+#define CONFIG_SPL_ENV_SUPPORT
|
|
|
|
+#define CONFIG_SPL_SERIAL_SUPPORT
|
|
|
|
+#define CONFIG_SPL_FLUSH_IMAGE
|
|
|
|
+#define CONFIG_SPL_TARGET "u-boot-with-spl.bin"
|
|
|
|
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
|
|
|
|
+#define CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
|
|
+#define CONFIG_SPL_I2C_SUPPORT
|
|
|
|
+#define CONFIG_SPL_DRIVERS_MISC_SUPPORT
|
|
|
|
+#define CONFIG_FSL_LAW /* Use common FSL init code */
|
|
|
|
+#define CONFIG_SYS_TEXT_BASE 0x00201000
|
|
|
|
+#define CONFIG_SPL_TEXT_BASE 0xFFFD8000
|
|
|
|
+#define CONFIG_SPL_PAD_TO 0x40000
|
|
|
|
+#define CONFIG_SPL_MAX_SIZE 0x28000
|
|
|
|
+#define RESET_VECTOR_OFFSET 0x27FFC
|
|
|
|
+#define BOOT_PAGE_OFFSET 0x27000
|
|
|
|
+
|
|
|
|
+#ifdef CONFIG_NAND
|
|
|
|
+#define CONFIG_SPL_NAND_SUPPORT
|
|
|
|
+#define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10)
|
|
|
|
+#define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000
|
|
|
|
+#define CONFIG_SYS_NAND_U_BOOT_START 0x00200000
|
|
|
|
+#define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10)
|
|
|
|
+#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
|
|
|
|
+#define CONFIG_SPL_NAND_BOOT
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+#ifdef CONFIG_SDCARD
|
|
|
|
+#define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC
|
|
|
|
+#define CONFIG_SPL_MMC_SUPPORT
|
|
|
|
+#define CONFIG_SPL_MMC_MINIMAL
|
|
|
|
+#define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10)
|
|
|
|
+#define CONFIG_SYS_MMC_U_BOOT_DST 0x00200000
|
|
|
|
+#define CONFIG_SYS_MMC_U_BOOT_START 0x00200000
|
|
|
|
+#define CONFIG_SYS_MMC_U_BOOT_OFFS (260 << 10)
|
|
|
|
+#ifndef CONFIG_SPL_BUILD
|
|
|
|
+#define CONFIG_SYS_MPC85XX_NO_RESETVEC
|
|
|
|
+#endif
|
|
|
|
+#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
|
|
|
|
+#define CONFIG_SPL_MMC_BOOT
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+#ifdef CONFIG_SPL_BUILD
|
|
|
|
+#define CONFIG_SPL_SKIP_RELOCATE
|
|
|
|
+#define CONFIG_SPL_COMMON_INIT_DDR
|
|
|
|
+#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
|
|
|
|
+#define CONFIG_SYS_NO_FLASH
|
|
|
|
+#endif
|
|
|
|
+
|
|
#endif
|
|
#endif
|
|
|
|
+#endif /* CONFIG_RAMBOOT_PBL */
|
|
|
|
|
|
#ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
|
|
#ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
|
|
/* Set 1M boot space */
|
|
/* Set 1M boot space */
|
|
@@ -64,12 +117,12 @@
|
|
#define CONFIG_ENV_IS_IN_MMC
|
|
#define CONFIG_ENV_IS_IN_MMC
|
|
#define CONFIG_SYS_MMC_ENV_DEV 0
|
|
#define CONFIG_SYS_MMC_ENV_DEV 0
|
|
#define CONFIG_ENV_SIZE 0x2000
|
|
#define CONFIG_ENV_SIZE 0x2000
|
|
-#define CONFIG_ENV_OFFSET (512 * 1658)
|
|
|
|
|
|
+#define CONFIG_ENV_OFFSET (512 * 0x800)
|
|
#elif defined(CONFIG_NAND)
|
|
#elif defined(CONFIG_NAND)
|
|
#define CONFIG_SYS_EXTRA_ENV_RELOC
|
|
#define CONFIG_SYS_EXTRA_ENV_RELOC
|
|
#define CONFIG_ENV_IS_IN_NAND
|
|
#define CONFIG_ENV_IS_IN_NAND
|
|
-#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
|
|
|
|
-#define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE)
|
|
|
|
|
|
+#define CONFIG_ENV_SIZE 0x2000
|
|
|
|
+#define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE)
|
|
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
|
|
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
|
|
#define CONFIG_ENV_IS_IN_REMOTE
|
|
#define CONFIG_ENV_IS_IN_REMOTE
|
|
#define CONFIG_ENV_ADDR 0xffe20000
|
|
#define CONFIG_ENV_ADDR 0xffe20000
|
|
@@ -244,8 +297,16 @@ unsigned long get_board_ddr_clk(void);
|
|
#define CONFIG_SYS_CS0_FTIM1 CONFIG_SYS_NAND_FTIM1
|
|
#define CONFIG_SYS_CS0_FTIM1 CONFIG_SYS_NAND_FTIM1
|
|
#define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NAND_FTIM2
|
|
#define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NAND_FTIM2
|
|
#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NAND_FTIM3
|
|
#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NAND_FTIM3
|
|
-#define CONFIG_SYS_CSPR2_EXT CONFIG_SYS_NOR0_CSPR_EXT
|
|
|
|
-#define CONFIG_SYS_CSPR2 CONFIG_SYS_NOR0_CSPR
|
|
|
|
|
|
+#define CONFIG_SYS_CSPR1_EXT CONFIG_SYS_NOR0_CSPR_EXT
|
|
|
|
+#define CONFIG_SYS_CSPR1 CONFIG_SYS_NOR0_CSPR
|
|
|
|
+#define CONFIG_SYS_AMASK1 CONFIG_SYS_NOR_AMASK
|
|
|
|
+#define CONFIG_SYS_CSOR1 CONFIG_SYS_NOR_CSOR
|
|
|
|
+#define CONFIG_SYS_CS1_FTIM0 CONFIG_SYS_NOR_FTIM0
|
|
|
|
+#define CONFIG_SYS_CS1_FTIM1 CONFIG_SYS_NOR_FTIM1
|
|
|
|
+#define CONFIG_SYS_CS1_FTIM2 CONFIG_SYS_NOR_FTIM2
|
|
|
|
+#define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NOR_FTIM3
|
|
|
|
+#define CONFIG_SYS_CSPR2_EXT CONFIG_SYS_NOR1_CSPR_EXT
|
|
|
|
+#define CONFIG_SYS_CSPR2 CONFIG_SYS_NOR1_CSPR
|
|
#define CONFIG_SYS_AMASK2 CONFIG_SYS_NOR_AMASK
|
|
#define CONFIG_SYS_AMASK2 CONFIG_SYS_NOR_AMASK
|
|
#define CONFIG_SYS_CSOR2 CONFIG_SYS_NOR_CSOR
|
|
#define CONFIG_SYS_CSOR2 CONFIG_SYS_NOR_CSOR
|
|
#define CONFIG_SYS_CS2_FTIM0 CONFIG_SYS_NOR_FTIM0
|
|
#define CONFIG_SYS_CS2_FTIM0 CONFIG_SYS_NOR_FTIM0
|
|
@@ -261,6 +322,14 @@ unsigned long get_board_ddr_clk(void);
|
|
#define CONFIG_SYS_CS0_FTIM1 CONFIG_SYS_NOR_FTIM1
|
|
#define CONFIG_SYS_CS0_FTIM1 CONFIG_SYS_NOR_FTIM1
|
|
#define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NOR_FTIM2
|
|
#define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NOR_FTIM2
|
|
#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NOR_FTIM3
|
|
#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NOR_FTIM3
|
|
|
|
+#define CONFIG_SYS_CSPR1_EXT CONFIG_SYS_NOR1_CSPR_EXT
|
|
|
|
+#define CONFIG_SYS_CSPR1 CONFIG_SYS_NOR1_CSPR
|
|
|
|
+#define CONFIG_SYS_AMASK1 CONFIG_SYS_NOR_AMASK
|
|
|
|
+#define CONFIG_SYS_CSOR1 CONFIG_SYS_NOR_CSOR
|
|
|
|
+#define CONFIG_SYS_CS1_FTIM0 CONFIG_SYS_NOR_FTIM0
|
|
|
|
+#define CONFIG_SYS_CS1_FTIM1 CONFIG_SYS_NOR_FTIM1
|
|
|
|
+#define CONFIG_SYS_CS1_FTIM2 CONFIG_SYS_NOR_FTIM2
|
|
|
|
+#define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NOR_FTIM3
|
|
#define CONFIG_SYS_CSPR2_EXT CONFIG_SYS_NAND_CSPR_EXT
|
|
#define CONFIG_SYS_CSPR2_EXT CONFIG_SYS_NAND_CSPR_EXT
|
|
#define CONFIG_SYS_CSPR2 CONFIG_SYS_NAND_CSPR
|
|
#define CONFIG_SYS_CSPR2 CONFIG_SYS_NAND_CSPR
|
|
#define CONFIG_SYS_AMASK2 CONFIG_SYS_NAND_AMASK
|
|
#define CONFIG_SYS_AMASK2 CONFIG_SYS_NAND_AMASK
|
|
@@ -270,14 +339,6 @@ unsigned long get_board_ddr_clk(void);
|
|
#define CONFIG_SYS_CS2_FTIM2 CONFIG_SYS_NAND_FTIM2
|
|
#define CONFIG_SYS_CS2_FTIM2 CONFIG_SYS_NAND_FTIM2
|
|
#define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3
|
|
#define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3
|
|
#endif
|
|
#endif
|
|
-#define CONFIG_SYS_CSPR1_EXT CONFIG_SYS_NOR1_CSPR_EXT
|
|
|
|
-#define CONFIG_SYS_CSPR1 CONFIG_SYS_NOR1_CSPR
|
|
|
|
-#define CONFIG_SYS_AMASK1 CONFIG_SYS_NOR_AMASK
|
|
|
|
-#define CONFIG_SYS_CSOR1 CONFIG_SYS_NOR_CSOR
|
|
|
|
-#define CONFIG_SYS_CS1_FTIM0 CONFIG_SYS_NOR_FTIM0
|
|
|
|
-#define CONFIG_SYS_CS1_FTIM1 CONFIG_SYS_NOR_FTIM1
|
|
|
|
-#define CONFIG_SYS_CS1_FTIM2 CONFIG_SYS_NOR_FTIM2
|
|
|
|
-#define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NOR_FTIM3
|
|
|
|
|
|
|
|
#if defined(CONFIG_RAMBOOT_PBL)
|
|
#if defined(CONFIG_RAMBOOT_PBL)
|
|
#define CONFIG_SYS_RAMBOOT
|
|
#define CONFIG_SYS_RAMBOOT
|
|
@@ -379,14 +440,14 @@ unsigned long get_board_ddr_clk(void);
|
|
#elif defined(CONFIG_SDCARD)
|
|
#elif defined(CONFIG_SDCARD)
|
|
/*
|
|
/*
|
|
* PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is
|
|
* PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is
|
|
- * about 825KB (1650 blocks), Env is stored after the image, and the env size is
|
|
|
|
- * 0x2000 (16 blocks), 8 + 1650 + 16 = 1674, enlarge it to 1680.
|
|
|
|
|
|
+ * about 1MB (2048 blocks), Env is stored after the image, and the env size is
|
|
|
|
+ * 0x2000 (16 blocks), 8 + 2048 + 16 = 2072, enlarge it to 2080.
|
|
*/
|
|
*/
|
|
#define CONFIG_SYS_QE_FMAN_FW_IN_MMC
|
|
#define CONFIG_SYS_QE_FMAN_FW_IN_MMC
|
|
-#define CONFIG_SYS_FMAN_FW_ADDR (512 * 1680)
|
|
|
|
|
|
+#define CONFIG_SYS_FMAN_FW_ADDR (512 * 0x820)
|
|
#elif defined(CONFIG_NAND)
|
|
#elif defined(CONFIG_NAND)
|
|
#define CONFIG_SYS_QE_FMAN_FW_IN_NAND
|
|
#define CONFIG_SYS_QE_FMAN_FW_IN_NAND
|
|
-#define CONFIG_SYS_FMAN_FW_ADDR (8 * CONFIG_SYS_NAND_BLOCK_SIZE)
|
|
|
|
|
|
+#define CONFIG_SYS_FMAN_FW_ADDR (11 * CONFIG_SYS_NAND_BLOCK_SIZE)
|
|
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
|
|
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
|
|
/*
|
|
/*
|
|
* Slave has no ucode locally, it can fetch this from remote. When implementing
|
|
* Slave has no ucode locally, it can fetch this from remote. When implementing
|