diff options
author | Tom Rini <trini@konsulko.com> | 2022-07-07 21:12:07 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-07-07 21:29:37 +0300 |
commit | ea92f95d630cba9c3a324d250258ad2e35d9c997 (patch) | |
tree | 68ad93bb452ccf3873a9b457a8cca9ea7e3c1916 /configs/T2080QDS_defconfig | |
parent | cb9843bda3e500eb4add1927be4ed72077a69774 (diff) | |
parent | c45568cc4e51b7bbe2f3ce28d8f2566048aeebf3 (diff) | |
download | u-boot-ea92f95d630cba9c3a324d250258ad2e35d9c997.tar.xz |
Merge branch '2022-07-07-Kconfig-migrations-dead-code-removal' into next
- Migrate more CONFIG options to Kconfig and remove some unused code
while we're at it.
Diffstat (limited to 'configs/T2080QDS_defconfig')
-rw-r--r-- | configs/T2080QDS_defconfig | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig index a94fd3f42e..fbfbab84a1 100644 --- a/configs/T2080QDS_defconfig +++ b/configs/T2080QDS_defconfig @@ -3,18 +3,17 @@ CONFIG_SYS_TEXT_BASE=0xEFF40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="t2080qds" -<<<<<<< HEAD -======= CONFIG_ENV_ADDR=0xEFF20000 CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y +CONFIG_SYS_BOOK3E_HV=y +CONFIG_SYS_FSL_CPC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PCIE3=y CONFIG_PCIE4=y ->>>>>>> Convert CONFIG_PCIE1 et al to Kconfig CONFIG_FSL_USE_PCA9547_MUX=y CONFIG_VID=y CONFIG_VID_FLS_ENV="t208xqds_vdd_mv" @@ -22,11 +21,6 @@ CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y CONFIG_FSL_QIXIS=y # CONFIG_QIXIS_I2C_ACCESS is not set -CONFIG_ENV_ADDR=0xEFF20000 -CONFIG_MPC85xx=y -CONFIG_TARGET_T2080QDS=y -CONFIG_MPC85XX_HAVE_RESET_VECTOR=y -CONFIG_ENABLE_36BIT_PHYS=y CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y |