diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-29 09:54:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-29 10:11:21 -0400 |
| commit | 5c873269fc374674e5e8aad65ab4ed45b1fe9f65 (patch) | |
| tree | 5b2860d103a7f70abfd4534e10bdb53539cf18b5 /configs/brppt2_defconfig | |
| parent | d61c11b8c894fad517677dc51ee82d1eade39c01 (diff) | |
| parent | 613c326581fd96b55dd21e3a6d23e844e896832b (diff) | |
Merge branch '2022-06-28-Kconfig-migrations' into next
- Convert a large number of CONFIG symbols to Kconfig. Of note is a
large chunk of USB symbols (and dead code removal), ensuring all
SPL/TPL/VPL symbols have an appropriate dependency, largely (but not
entirely) removing the testing of CONFIG_SPL_BUILD in board headers,
and allowing CONFIG_EXTRA_ENV_TEXT and CONFIG_EXTRA_ENV_SETTINGS to
co-exist as this facilities migration of many platforms.
Diffstat (limited to 'configs/brppt2_defconfig')
| -rw-r--r-- | configs/brppt2_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/brppt2_defconfig b/configs/brppt2_defconfig index db87b579ee..e2c36e13ad 100644 --- a/configs/brppt2_defconfig +++ b/configs/brppt2_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y # CONFIG_SPL_SYS_THUMB_BUILD is not set CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_MX6=y -CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds" CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x1000 @@ -10,6 +9,7 @@ CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds" CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x20000 CONFIG_ENV_SECT_SIZE=0x10000 @@ -57,6 +57,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_BOOTP_MAY_FAIL=y # CONFIG_CMD_NFS is not set +CONFIG_SYS_DISABLE_AUTOLOAD=y CONFIG_CMD_MII=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y |