diff options
author | Tom Rini <trini@konsulko.com> | 2022-07-06 09:15:36 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-07-06 09:15:36 -0400 |
commit | 4b7d0b24c7047c70d13db953b950a549accb8e14 (patch) | |
tree | d3b1ad18c27f5c8239fbb8dd3a6a70291db6eca4 /configs/T2080QDS_SPIFLASH_defconfig | |
parent | e1d3e637c78790e18d64733fae913d088c4c3c76 (diff) | |
parent | 432243cee100e1d8f60399f0ae8f76cf7c83975f (diff) | |
download | u-boot-4b7d0b24c7047c70d13db953b950a549accb8e14.tar.gz |
Merge branch '2022-07-05-more-Kconfig-migrations' into next
- Migrate more CONFIG symbols to Kconfig, remove some dead code and
clean-up arch/Kconfig.nxp slightly more.
Diffstat (limited to 'configs/T2080QDS_SPIFLASH_defconfig')
-rw-r--r-- | configs/T2080QDS_SPIFLASH_defconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig index ce0b15c9470..73c50b9245a 100644 --- a/configs/T2080QDS_SPIFLASH_defconfig +++ b/configs/T2080QDS_SPIFLASH_defconfig @@ -21,7 +21,22 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y +CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y +<<<<<<< HEAD +======= +CONFIG_PCIE1=y +CONFIG_PCIE2=y +CONFIG_PCIE3=y +CONFIG_PCIE4=y +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 +>>>>>>> Convert CONFIG_PCIE1 et al to Kconfig CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y |