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/axm_defconfig | |
parent | d61c11b8c894fad517677dc51ee82d1eade39c01 (diff) | |
parent | 613c326581fd96b55dd21e3a6d23e844e896832b (diff) | |
download | u-boot-5c873269fc374674e5e8aad65ab4ed45b1fe9f65.tar.gz u-boot-5c873269fc374674e5e8aad65ab4ed45b1fe9f65.tar.bz2 u-boot-5c873269fc374674e5e8aad65ab4ed45b1fe9f65.zip |
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/axm_defconfig')
-rw-r--r-- | configs/axm_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/axm_defconfig b/configs/axm_defconfig index b61151129f..a5f60bd8d0 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -7,7 +7,6 @@ CONFIG_SYS_THUMB_BUILD=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_AT91=y -CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds" CONFIG_SYS_TEXT_BASE=0x21000000 CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_TARGET_TAURUS=y @@ -17,6 +16,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_OFFSET=0x100000 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus" |