diff options
| author | Tom Rini | 2022-07-07 14:12:07 -0400 |
|---|---|---|
| committer | Tom Rini | 2022-07-07 14:29:37 -0400 |
| commit | ea92f95d630cba9c3a324d250258ad2e35d9c997 (patch) | |
| tree | 68ad93bb452ccf3873a9b457a8cca9ea7e3c1916 /configs/T2080QDS_SDCARD_defconfig | |
| parent | cb9843bda3e500eb4add1927be4ed72077a69774 (diff) | |
| parent | c45568cc4e51b7bbe2f3ce28d8f2566048aeebf3 (diff) | |
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_SDCARD_defconfig')
| -rw-r--r-- | configs/T2080QDS_SDCARD_defconfig | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig index 1818762ded9..2f12b4e609e 100644 --- a/configs/T2080QDS_SDCARD_defconfig +++ b/configs/T2080QDS_SDCARD_defconfig @@ -6,13 +6,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x100000 CONFIG_DEFAULT_DEVICE_TREE="t2080qds" CONFIG_SPL_TEXT_BASE=0xFFFD8000 -CONFIG_FSL_USE_PCA9547_MUX=y -CONFIG_VID=y -CONFIG_VID_FLS_ENV="t208xqds_vdd_mv" -CONFIG_VOL_MONITOR_IR36021_READ=y -CONFIG_VOL_MONITOR_IR36021_SET=y -CONFIG_FSL_QIXIS=y -# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y @@ -20,9 +13,9 @@ CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y CONFIG_ENABLE_36BIT_PHYS=y +CONFIG_SYS_BOOK3E_HV=y +CONFIG_SYS_FSL_CPC=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y -<<<<<<< HEAD -======= CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PCIE3=y @@ -34,7 +27,6 @@ CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y CONFIG_FSL_QIXIS=y # CONFIG_QIXIS_I2C_ACCESS is not set ->>>>>>> Convert CONFIG_PCIE1 et al to Kconfig CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y |