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/edminiv2_defconfig | |
parent | d61c11b8c894fad517677dc51ee82d1eade39c01 (diff) | |
parent | 613c326581fd96b55dd21e3a6d23e844e896832b (diff) | |
download | u-boot-5c873269fc374674e5e8aad65ab4ed45b1fe9f65.tar.gz |
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/edminiv2_defconfig')
-rw-r--r-- | configs/edminiv2_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig index b8906b1bb0d..6b7cdbe4b11 100644 --- a/configs/edminiv2_defconfig +++ b/configs/edminiv2_defconfig @@ -1,12 +1,12 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_ORION5X=y -CONFIG_SPL_LDSCRIPT="arch/arm/mach-orion5x/u-boot-spl.lds" CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_SPL_LDSCRIPT="arch/arm/mach-orion5x/u-boot-spl.lds" CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_SPL_TEXT_BASE=0xffff0000 @@ -56,6 +56,7 @@ CONFIG_SYS_ATA_DATA_OFFSET=0x100 CONFIG_SYS_ATA_REG_OFFSET=0x100 CONFIG_SYS_ATA_ALT_OFFSET=0x100 CONFIG_SYS_ATA_IDE0_OFFSET=0x4000 +CONFIG_LBA48=y CONFIG_SYS_I2C_LEGACY=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MVTWSI=y |