diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-15 12:58:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-15 12:58:06 -0400 |
| commit | 8754656680b673b64282bc8d03c0e3f3ad0978c4 (patch) | |
| tree | 8a581bacb77dd20d91cdb9cf1d35821668ed7889 /configs/T1040RDB_NAND_defconfig | |
| parent | 698bc1f2e95af4d909fb6a0f9a4b9ce32287ac5f (diff) | |
| parent | 75846445edaa9cd2ec71ae21178d769656b8435b (diff) | |
Merge branch '2019-06-14-master-imports'
- Kconfig migrations of SPL_BOOT_xxx, SYS_LDSCRIPT, IP_DEFRAG,
TFTP_BLOCKSIZE.
- Typo fixes, other minor corrections.
Diffstat (limited to 'configs/T1040RDB_NAND_defconfig')
| -rw-r--r-- | configs/T1040RDB_NAND_defconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig index 2f32b67d1d..82cec34336 100644 --- a/configs/T1040RDB_NAND_defconfig +++ b/configs/T1040RDB_NAND_defconfig @@ -7,17 +7,21 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_T1040RDB=y +CONFIG_SYS_CUSTOM_LDSCRIPT=y +CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_SPL_FRAMEWORK is not set +CONFIG_SPL_NAND_BOOT=y +CONFIG_SPL_FSL_PBL=y CONFIG_SPL_TEXT_BASE=0xFFFD8000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y |