diff options
Diffstat (limited to 'include/configs/simc-t10xx.h')
| -rw-r--r-- | include/configs/simc-t10xx.h | 45 |
1 files changed, 32 insertions, 13 deletions
diff --git a/include/configs/simc-t10xx.h b/include/configs/simc-t10xx.h index 49550b7..860a851 100644 --- a/include/configs/simc-t10xx.h +++ b/include/configs/simc-t10xx.h @@ -11,6 +11,8 @@ #include <generated/autoconf.h> +#define CONFIG_SECURE_BOOT + #define MPC85XX_GPIO_NR(port, pin) ((((port)-1)*32)+((pin)&31)) /* @@ -37,14 +39,30 @@ /* PBI commands are cpu independent for now */ +/*#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/scalys/simc-t10xx/simc-t10xx_pbi.cfg*/ + +#ifdef CONFIG_SECURE_BOOT +/* Secure boot enabled */ +#define CONFIG_SYS_FSL_PBL_PBI \ + $(SRCTREE)/board/scalys/simc-t10xx/simc-t10xx_nand_secure_pbi.cfg +#else +/* Secure boot disabled */ #define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/scalys/simc-t10xx/simc-t10xx_pbi.cfg +#endif + + + /* Set the RCW config depending on the CPU type */ #if defined(CONFIG_PPC_T1022) #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/scalys/simc-t10xx/simc-t1022_rcw.cfg #elif defined(CONFIG_PPC_T1040) +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/scalys/simc-t10xx/simc-t1040_nand_secure_rcw.cfg +#else #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/scalys/simc-t10xx/simc-t1040_rcw.cfg #endif +#endif #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT @@ -76,7 +94,12 @@ #ifdef CONFIG_NAND #define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) + + +#define CONFIG_SYS_NAND_U_BOOT_SIZE ( (2048-256) *1024) +#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) + + #define CONFIG_SYS_NAND_U_BOOT_DST 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_START 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) @@ -150,7 +173,7 @@ #define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_OFFSET 0x100000 /* Refer to mtdparts */ +#define CONFIG_ENV_OFFSET 0x200000 /* Refer to mtdparts */ #else #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) @@ -533,11 +556,6 @@ #define CONFIG_SYS_DPAA_FMAN #define CONFIG_SYS_DPAA_PME -/* QE Connector is available on SiMC-T10x but not part of this development */ -#ifdef QE_CONNCECTOR -#define CONFIG_QE -#define CONFIG_U_QE -#endif /* Default address of microcode for the Linux Fman driver */ #if defined(CONFIG_SDCARD) @@ -550,7 +568,7 @@ #define CONFIG_SYS_FMAN_FW_ADDR (512 * 0x820) #elif defined(CONFIG_NAND) #define CONFIG_SYS_QE_FMAN_FW_IN_NAND -#define CONFIG_SYS_FMAN_FW_ADDR (0x140000) /* Refer to mtdparts */ +#define CONFIG_SYS_FMAN_FW_ADDR (0x240000) /* Refer to mtdparts: fman_ucode */ #else #define CONFIG_SYS_QE_FMAN_FW_IN_NOR #define CONFIG_SYS_FMAN_FW_ADDR 0xEFF00000 @@ -669,12 +687,13 @@ "spi0=spife110000.0" #define MTDPARTS_DEFAULT \ - "mtdparts=fff800000.flash:," \ - "1M@0x0(u-boot)," \ + "mtdparts=fff800000.flash:" \ + "2M@0x0(u-boot)," \ "256k(env)," \ "256k(fman_ucode)," \ - "0x3fdc0000(ubipart)," \ - "1M@0x3ff00000(bbt)ro}" + "256k(qe_ucode)," \ + "0x3fc80000(ubipart)," \ + "1M@0x3ff00000(bbt)ro" /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 @@ -702,7 +721,7 @@ "TFTP_PATH=\0" \ \ "mtdids=nand0=fff800000.flash\0" \ - "mtdparts=mtdparts=fff800000.flash:1M@0x0(u-boot),256k(env),256k(fman_ucode),0x3fdc0000(ubipart),1M@0x3ff00000(bbt)ro\0" \ + "mtdparts=" MTDPARTS_DEFAULT "\0" \ \ "setfans=i2c dev 0; i2c mw 0x2e 0x40 1;i2c mw 0x2e 0x7d 0x2;" \ "i2c mw 0x2e 0x5c 0xe0;i2c mw 0x2e 0x5d 0xe0;i2c mw 0x2e 0x5e 0xe0;" \ |