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.

diff --cc configs/T2080QDS_NAND_defconfig
index 05e46e6,8cb38f2..0a83ed1
--- 1/configs/T2080QDS_NAND_defconfig
--- 2/configs/T2080QDS_NAND_defconfig
+++ b/configs/T2080QDS_NAND_defconfig
@@@ -6,23 -6,25 +6,16 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x140000
  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_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  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
  CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
--<<<<<<< HEAD
--=======
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_PCIE3=y
@@@ -34,7 -36,7 +27,6 @@@ CONFIG_VOL_MONITOR_IR36021_READ=
  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

diff --cc configs/T2080QDS_SDCARD_defconfig
index 1818762,5691ba5..2f12b4e
--- 1/configs/T2080QDS_SDCARD_defconfig
--- 2/configs/T2080QDS_SDCARD_defconfig
+++ b/configs/T2080QDS_SDCARD_defconfig
@@@ -6,13 -6,13 +6,6 @@@ CONFIG_ENV_SIZE=0x200
  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 -20,11 +13,9 @@@ CONFIG_SPL=
  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 -36,7 +27,6 @@@ CONFIG_VOL_MONITOR_IR36021_READ=
  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

diff --cc configs/T2080QDS_SECURE_BOOT_defconfig
index 30d1b85,ee7edd5..2fc4e16
--- 1/configs/T2080QDS_SECURE_BOOT_defconfig
--- 2/configs/T2080QDS_SECURE_BOOT_defconfig
+++ b/configs/T2080QDS_SECURE_BOOT_defconfig
@@@ -106,5 -108,5 +108,4 @@@ CONFIG_USB_STORAGE=
  CONFIG_ADDR_MAP=y
  CONFIG_SYS_NUM_ADDR_MAP=64
  CONFIG_RSA=y
--CONFIG_SPL_RSA=y
  CONFIG_RSA_SOFTWARE_EXP=y

diff --cc configs/T2080QDS_SPIFLASH_defconfig
index 73c50b9,53a5051..7adf3af
--- 1/configs/T2080QDS_SPIFLASH_defconfig
--- 2/configs/T2080QDS_SPIFLASH_defconfig
+++ b/configs/T2080QDS_SPIFLASH_defconfig
@@@ -7,13 -7,13 +7,6 @@@ CONFIG_ENV_OFFSET=0x10000
  CONFIG_ENV_SECT_SIZE=0x10000
  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_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
@@@ -22,9 -22,11 +15,9 @@@ CONFIG_SPL_SPI=
  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
@@@ -36,7 -38,7 +29,6 @@@ CONFIG_VOL_MONITOR_IR36021_READ=
  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

diff --cc configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
index 48ef69c,5deb88d..2228c64
--- 1/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
--- 2/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
@@@ -2,8 -2,8 +2,6 @@@ CONFIG_PPC=
  CONFIG_SYS_TEXT_BASE=0xFFF40000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="t2080qds"
--<<<<<<< HEAD
--=======
  CONFIG_ENV_ADDR=0xFFE20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080QDS=y
@@@ -14,7 -16,7 +14,6 @@@ CONFIG_PCIE1=
  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,12 -24,12 +21,6 @@@ CONFIG_VOL_MONITOR_IR36021_READ=
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
--CONFIG_ENV_ADDR=0xFFE20000
--CONFIG_MPC85xx=y
--CONFIG_TARGET_T2080QDS=y
--CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
--CONFIG_ENABLE_36BIT_PHYS=y
--CONFIG_SRIO_PCIE_BOOT_SLAVE=y
  CONFIG_MP=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y

diff --cc configs/T2080QDS_defconfig
index a94fd3f,4969909..fbfbab8
--- 1/configs/T2080QDS_defconfig
--- 2/configs/T2080QDS_defconfig
+++ b/configs/T2080QDS_defconfig
@@@ -3,8 -3,8 +3,6 @@@ CONFIG_SYS_TEXT_BASE=0xEFF4000
  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
@@@ -14,7 -16,7 +14,6 @@@ CONFIG_PCIE1=
  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 -24,11 +21,6 @@@ CONFIG_VOL_MONITOR_IR36021_READ=
  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

diff --cc configs/T2080RDB_NAND_defconfig
index 6566226,af66fd2..b84d653
--- 1/configs/T2080RDB_NAND_defconfig
--- 2/configs/T2080RDB_NAND_defconfig
+++ b/configs/T2080RDB_NAND_defconfig
@@@ -6,20 -6,22 +6,16 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_DEFAULT_DEVICE_TREE="t2080rdb"
  CONFIG_SPL_TEXT_BASE=0xFFFD8000
--CONFIG_VID=y
--CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
--CONFIG_VOL_MONITOR_IR36021_READ=y
--CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080RDB=y
  CONFIG_ENABLE_36BIT_PHYS=y
+ CONFIG_SYS_BOOK3E_HV=y
+ CONFIG_SYS_FSL_CPC=y
  CONFIG_SYS_MPC85XX_NO_RESETVEC=y
  CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
--<<<<<<< HEAD
--=======
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_PCIE3=y
@@@ -28,7 -30,7 +24,6 @@@ CONFIG_VID=
  CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
-->>>>>>> Convert CONFIG_PCIE1 et al to Kconfig
  CONFIG_SYS_MEMTEST_START=0x00200000
  CONFIG_SYS_MEMTEST_END=0x00400000
  CONFIG_MP=y

diff --cc configs/T2080RDB_SDCARD_defconfig
index 3333ac1,41956d8..21f76bd
--- 1/configs/T2080RDB_SDCARD_defconfig
--- 2/configs/T2080RDB_SDCARD_defconfig
+++ b/configs/T2080RDB_SDCARD_defconfig
@@@ -6,10 -6,10 +6,6 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_DEFAULT_DEVICE_TREE="t2080rdb"
  CONFIG_SPL_TEXT_BASE=0xFFFD8000
--CONFIG_VID=y
--CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
--CONFIG_VOL_MONITOR_IR36021_READ=y
--CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
@@@ -17,9 -17,11 +13,9 @@@ CONFIG_SPL=
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080RDB=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
@@@ -28,7 -30,7 +24,6 @@@ CONFIG_VID=
  CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
-->>>>>>> Convert CONFIG_PCIE1 et al to Kconfig
  CONFIG_SYS_MEMTEST_START=0x00200000
  CONFIG_SYS_MEMTEST_END=0x00400000
  CONFIG_MP=y

diff --cc configs/T2080RDB_SPIFLASH_defconfig
index 5812daa,0811b18..bcc60b7
--- 1/configs/T2080RDB_SPIFLASH_defconfig
--- 2/configs/T2080RDB_SPIFLASH_defconfig
+++ b/configs/T2080RDB_SPIFLASH_defconfig
@@@ -7,10 -7,10 +7,6 @@@ CONFIG_ENV_OFFSET=0x10000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="t2080rdb"
  CONFIG_SPL_TEXT_BASE=0xFFFD8000
--CONFIG_VID=y
--CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
--CONFIG_VOL_MONITOR_IR36021_READ=y
--CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
@@@ -19,9 -19,11 +15,9 @@@ CONFIG_SPL_SPI=
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080RDB=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
@@@ -30,7 -32,7 +26,6 @@@ CONFIG_VID=
  CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
-->>>>>>> Convert CONFIG_PCIE1 et al to Kconfig
  CONFIG_SYS_MEMTEST_START=0x00200000
  CONFIG_SYS_MEMTEST_END=0x00400000
  CONFIG_MP=y

diff --cc configs/T2080RDB_defconfig
index 563d0b5,b8b66d4..8df5b3d
--- 1/configs/T2080RDB_defconfig
--- 2/configs/T2080RDB_defconfig
+++ b/configs/T2080RDB_defconfig
@@@ -3,10 -3,10 +3,6 @@@ CONFIG_SYS_TEXT_BASE=0xEFF4000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="t2080rdb"
--CONFIG_VID=y
--CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
--CONFIG_VOL_MONITOR_IR36021_READ=y
--CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080RDB=y

diff --cc configs/T2080RDB_revD_NAND_defconfig
index 9844343,48711c5..a8e020a
--- 1/configs/T2080RDB_revD_NAND_defconfig
--- 2/configs/T2080RDB_revD_NAND_defconfig
+++ b/configs/T2080RDB_revD_NAND_defconfig
@@@ -6,10 -6,10 +6,6 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_DEFAULT_DEVICE_TREE="t2080rdb"
  CONFIG_SPL_TEXT_BASE=0xFFFD8000
--CONFIG_VID=y
--CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
--CONFIG_VOL_MONITOR_IR36021_READ=y
--CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
@@@ -19,8 -21,8 +17,6 @@@ CONFIG_SYS_FSL_CPC=
  CONFIG_SYS_MPC85XX_NO_RESETVEC=y
  CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
  CONFIG_T2080RDB_REV_D=y
--<<<<<<< HEAD
--=======
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_PCIE3=y
@@@ -29,7 -31,7 +25,6 @@@ CONFIG_VID=
  CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
-->>>>>>> Convert CONFIG_PCIE1 et al to Kconfig
  CONFIG_SYS_MEMTEST_START=0x00200000
  CONFIG_SYS_MEMTEST_END=0x00400000
  CONFIG_MP=y

diff --cc configs/T2080RDB_revD_SDCARD_defconfig
index 004f677,bd98910..3baf69a
--- 1/configs/T2080RDB_revD_SDCARD_defconfig
--- 2/configs/T2080RDB_revD_SDCARD_defconfig
+++ b/configs/T2080RDB_revD_SDCARD_defconfig
@@@ -6,10 -6,10 +6,6 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_DEFAULT_DEVICE_TREE="t2080rdb"
  CONFIG_SPL_TEXT_BASE=0xFFFD8000
--CONFIG_VID=y
--CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
--CONFIG_VOL_MONITOR_IR36021_READ=y
--CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
@@@ -17,10 -17,12 +13,10 @@@ CONFIG_SPL=
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080RDB=y
  CONFIG_ENABLE_36BIT_PHYS=y
+ CONFIG_SYS_BOOK3E_HV=y
+ CONFIG_SYS_FSL_CPC=y
  CONFIG_SYS_MPC85XX_NO_RESETVEC=y
  CONFIG_T2080RDB_REV_D=y
--<<<<<<< HEAD
--=======
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_PCIE3=y
@@@ -29,7 -31,7 +25,6 @@@ CONFIG_VID=
  CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
-->>>>>>> Convert CONFIG_PCIE1 et al to Kconfig
  CONFIG_SYS_MEMTEST_START=0x00200000
  CONFIG_SYS_MEMTEST_END=0x00400000
  CONFIG_MP=y

diff --cc configs/T2080RDB_revD_SPIFLASH_defconfig
index 610f3f8,04ef733..9d8feac
--- 1/configs/T2080RDB_revD_SPIFLASH_defconfig
--- 2/configs/T2080RDB_revD_SPIFLASH_defconfig
+++ b/configs/T2080RDB_revD_SPIFLASH_defconfig
@@@ -7,10 -7,10 +7,6 @@@ CONFIG_ENV_OFFSET=0x10000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="t2080rdb"
  CONFIG_SPL_TEXT_BASE=0xFFFD8000
--CONFIG_VID=y
--CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
--CONFIG_VOL_MONITOR_IR36021_READ=y
--CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
@@@ -19,10 -19,12 +15,10 @@@ CONFIG_SPL_SPI=
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080RDB=y
  CONFIG_ENABLE_36BIT_PHYS=y
+ CONFIG_SYS_BOOK3E_HV=y
+ CONFIG_SYS_FSL_CPC=y
  CONFIG_SYS_MPC85XX_NO_RESETVEC=y
  CONFIG_T2080RDB_REV_D=y
--<<<<<<< HEAD
--=======
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_PCIE3=y
@@@ -31,7 -33,7 +27,6 @@@ CONFIG_VID=
  CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
-->>>>>>> Convert CONFIG_PCIE1 et al to Kconfig
  CONFIG_SYS_MEMTEST_START=0x00200000
  CONFIG_SYS_MEMTEST_END=0x00400000
  CONFIG_MP=y

diff --cc configs/T2080RDB_revD_defconfig
index ca6a741,25ee845..e4eaa75
--- 1/configs/T2080RDB_revD_defconfig
--- 2/configs/T2080RDB_revD_defconfig
+++ b/configs/T2080RDB_revD_defconfig
@@@ -3,18 -3,20 +3,14 @@@ CONFIG_SYS_TEXT_BASE=0xEFF4000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="t2080rdb"
--CONFIG_VID=y
--CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
--CONFIG_VOL_MONITOR_IR36021_READ=y
--CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080RDB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
  CONFIG_ENABLE_36BIT_PHYS=y
+ CONFIG_SYS_BOOK3E_HV=y
+ CONFIG_SYS_FSL_CPC=y
  CONFIG_T2080RDB_REV_D=y
--<<<<<<< HEAD
--=======
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_PCIE3=y
@@@ -23,7 -25,7 +19,6 @@@ CONFIG_VID=
  CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
-->>>>>>> Convert CONFIG_PCIE1 et al to Kconfig
  CONFIG_SYS_MEMTEST_START=0x00200000
  CONFIG_SYS_MEMTEST_END=0x00400000
  CONFIG_MP=y

diff --cc configs/T4240RDB_SDCARD_defconfig
index 3e43f9b,6141f55..a2062b4
--- 1/configs/T4240RDB_SDCARD_defconfig
--- 2/configs/T4240RDB_SDCARD_defconfig
+++ b/configs/T4240RDB_SDCARD_defconfig
@@@ -6,10 -6,10 +6,6 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_DEFAULT_DEVICE_TREE="t4240rdb"
  CONFIG_SPL_TEXT_BASE=0xFFFD8000
--CONFIG_VID=y
--CONFIG_VID_FLS_ENV="t4240rdb_vdd_mv"
--CONFIG_VOL_MONITOR_IR36021_READ=y
--CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
@@@ -17,9 -17,11 +13,9 @@@ CONFIG_SPL=
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T4240RDB=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
@@@ -28,7 -30,7 +24,6 @@@ CONFIG_VID=
  CONFIG_VID_FLS_ENV="t4240rdb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
-->>>>>>> Convert CONFIG_PCIE1 et al to Kconfig
  CONFIG_MP=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y

diff --cc configs/T4240RDB_defconfig
index 9f6457f,7fc4dc9..c321647
--- 1/configs/T4240RDB_defconfig
--- 2/configs/T4240RDB_defconfig
+++ b/configs/T4240RDB_defconfig
@@@ -3,10 -3,10 +3,6 @@@ CONFIG_SYS_TEXT_BASE=0xEFF4000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="t4240rdb"
--CONFIG_VID=y
--CONFIG_VID_FLS_ENV="t4240rdb_vdd_mv"
--CONFIG_VOL_MONITOR_IR36021_READ=y
--CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T4240RDB=y

diff --cc configs/am335x_evm_spiboot_defconfig
index 00e80a8,efec1a9..1f28d50
--- 1/configs/am335x_evm_spiboot_defconfig
--- 2/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@@ -76,7 -78,7 +78,6 @@@ CONFIG_SYS_NAND_PAGE_SIZE=0x80
  CONFIG_SYS_NAND_OOBSIZE=0x40
  CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
  CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
--# CONFIG_SPL_NAND_AM33XX_BCH is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SF_DEFAULT_SPEED=24000000
  CONFIG_SPI_FLASH_WINBOND=y

diff --cc configs/am43xx_evm_qspiboot_defconfig
index 80ad268,80ad268..18be57a
--- 1/configs/am43xx_evm_qspiboot_defconfig
--- 2/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@@ -54,8 -54,8 +54,6 @@@ CONFIG_SF_DEFAULT_SPEED=4800000
  CONFIG_SPI_FLASH_MACRONIX=y
  CONFIG_MII=y
  CONFIG_DRIVER_TI_CPSW=y
--CONFIG_SPL_POWER_LEGACY=y
--CONFIG_SPL_POWER_I2C=y
  CONFIG_SYS_NS16550=y
  CONFIG_SPI=y
  CONFIG_TI_QSPI=y

diff --cc configs/evb-ast2500_defconfig
index e56e3b9,e56e3b9..e7d93ec
--- 1/configs/evb-ast2500_defconfig
--- 2/configs/evb-ast2500_defconfig
+++ b/configs/evb-ast2500_defconfig
@@@ -36,7 -36,7 +36,6 @@@ CONFIG_CLK=
  CONFIG_ASPEED_GPIO=y
  CONFIG_DM_I2C=y
  CONFIG_SYS_I2C_ASPEED=y
--CONFIG_MISC=y
  CONFIG_I2C_EEPROM=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_ASPEED=y

diff --cc configs/evb-ast2600_defconfig
index 970d356,970d356..d07d3c4
--- 1/configs/evb-ast2600_defconfig
--- 2/configs/evb-ast2600_defconfig
+++ b/configs/evb-ast2600_defconfig
@@@ -84,7 -84,7 +84,6 @@@ CONFIG_SPL_CLK=
  CONFIG_ASPEED_GPIO=y
  CONFIG_DM_I2C=y
  CONFIG_SYS_I2C_ASPEED=y
--CONFIG_MISC=y
  CONFIG_I2C_EEPROM=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_ASPEED=y

diff --cc configs/ls1021aqds_nor_SECURE_BOOT_defconfig
index d4b9cd2,01db23c..727475f
--- 1/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
--- 2/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@@ -99,4 -100,4 +100,3 @@@ CONFIG_USB_XHCI_HCD=
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
  CONFIG_RSA=y
--CONFIG_SPL_RSA=y

diff --cc configs/ls1021atwr_nor_SECURE_BOOT_defconfig
index 41887e0,8daa1c6..b86a60f
--- 1/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
--- 2/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@@ -82,4 -83,4 +83,3 @@@ CONFIG_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_RSA=y
--CONFIG_SPL_RSA=y

diff --cc configs/ls1028aqds_tfa_SECURE_BOOT_defconfig
index 0d32be1,0d32be1..752dca2
--- 1/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig
--- 2/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig
@@@ -8,14 -8,14 +8,14 @@@ CONFIG_SYS_MALLOC_LEN=0x20200
  CONFIG_SYS_MALLOC_F_LEN=0x6000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1028a-qds-duart"
--CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
  CONFIG_AHCI=y
++CONFIG_NXP_ESBC=y
++CONFIG_FSL_QIXIS=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1028aqds_tfa_defconfig
index 00a5ead,00a5ead..bb0e76d
--- 1/configs/ls1028aqds_tfa_defconfig
--- 2/configs/ls1028aqds_tfa_defconfig
+++ b/configs/ls1028aqds_tfa_defconfig
@@@ -12,12 -12,12 +12,12 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1028a-qds-duart"
--CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
  CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
++CONFIG_FSL_QIXIS=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1028aqds_tfa_lpuart_defconfig
index 7e08601,7e08601..7025f11
--- 1/configs/ls1028aqds_tfa_lpuart_defconfig
--- 2/configs/ls1028aqds_tfa_lpuart_defconfig
+++ b/configs/ls1028aqds_tfa_lpuart_defconfig
@@@ -11,12 -11,12 +11,12 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1028a-qds-lpuart"
--CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
  CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
++CONFIG_FSL_QIXIS=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1028ardb_tfa_SECURE_BOOT_defconfig
index 9330840,9330840..3177368
--- 1/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig
--- 2/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig
@@@ -8,14 -8,14 +8,14 @@@ CONFIG_SYS_MALLOC_LEN=0x20200
  CONFIG_SYS_MALLOC_F_LEN=0x6000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1028a-rdb"
--CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
  CONFIG_AHCI=y
++CONFIG_NXP_ESBC=y
++CONFIG_FSL_QIXIS=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1028ardb_tfa_defconfig
index bc5987c,bc5987c..c953706
--- 1/configs/ls1028ardb_tfa_defconfig
--- 2/configs/ls1028ardb_tfa_defconfig
+++ b/configs/ls1028ardb_tfa_defconfig
@@@ -12,12 -12,12 +12,12 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1028a-rdb"
--CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
  CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
++CONFIG_FSL_QIXIS=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
index 4c8a615,4c8a615..1ebe893
--- 1/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
--- 2/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
@@@ -107,5 -107,5 +107,4 @@@ CONFIG_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_RSA=y
--CONFIG_SPL_RSA=y
  CONFIG_RSA_SOFTWARE_EXP=y

diff --cc configs/ls1043ardb_SECURE_BOOT_defconfig
index 8b2f094,8b2f094..787c8f9
--- 1/configs/ls1043ardb_SECURE_BOOT_defconfig
--- 2/configs/ls1043ardb_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_SECURE_BOOT_defconfig
@@@ -91,6 -91,6 +91,5 @@@ CONFIG_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_RSA=y
--CONFIG_SPL_RSA=y
  CONFIG_RSA_SOFTWARE_EXP=y
  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

diff --cc configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
index 4ebc636,4ebc636..12ccb78
--- 1/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
--- 2/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
@@@ -89,6 -89,6 +89,5 @@@ CONFIG_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_RSA=y
--CONFIG_SPL_RSA=y
  CONFIG_RSA_SOFTWARE_EXP=y
  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

diff --cc configs/ls1088aqds_defconfig
index be351a3,be351a3..64d87ae
--- 1/configs/ls1088aqds_defconfig
--- 2/configs/ls1088aqds_defconfig
+++ b/configs/ls1088aqds_defconfig
@@@ -8,16 -8,16 +8,15 @@@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds"
++CONFIG_FSL_LS_PPA=y
++CONFIG_ENV_ADDR=0x80300000
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
--CONFIG_SPL_VID=y
  CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv"
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_ENV_ADDR=0x80300000
--CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y

diff --cc configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
index 7c2134a,7c2134a..3af10a0
--- 1/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
--- 2/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
@@@ -5,19 -5,19 +5,18 @@@ CONFIG_SYS_TEXT_BASE=0x2010000
  CONFIG_SYS_MALLOC_LEN=0x202000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds"
++CONFIG_FSL_LS_PPA=y
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_AHCI=y
++CONFIG_NXP_ESBC=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
--CONFIG_SPL_VID=y
  CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv"
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1088aqds_qspi_defconfig
index 0aed102,0aed102..55a5389
--- 1/configs/ls1088aqds_qspi_defconfig
--- 2/configs/ls1088aqds_qspi_defconfig
+++ b/configs/ls1088aqds_qspi_defconfig
@@@ -9,17 -9,17 +9,16 @@@ CONFIG_ENV_OFFSET=0x30000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds"
++CONFIG_FSL_LS_PPA=y
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_ENV_ADDR=0x20300000
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
--CONFIG_SPL_VID=y
  CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv"
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_ENV_ADDR=0x20300000
--CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1088aqds_sdcard_ifc_defconfig
index 6ec9f2b,6ec9f2b..d3b0684
--- 1/configs/ls1088aqds_sdcard_ifc_defconfig
--- 2/configs/ls1088aqds_sdcard_ifc_defconfig
+++ b/configs/ls1088aqds_sdcard_ifc_defconfig
@@@ -11,6 -11,6 +11,12 @@@ CONFIG_ENV_OFFSET=0x30000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds"
  CONFIG_SPL_TEXT_BASE=0x1800a000
++CONFIG_FSL_LS_PPA=y
++CONFIG_SPL_MMC=y
++CONFIG_SPL_SERIAL=y
++CONFIG_SPL_DRIVERS_MISC=y
++CONFIG_SPL=y
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_SPL_VID=y
@@@ -18,12 -18,12 +24,6 @@@ CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_SPL_MMC=y
--CONFIG_SPL_SERIAL=y
--CONFIG_SPL_DRIVERS_MISC=y
--CONFIG_SPL=y
--CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y

diff --cc configs/ls1088aqds_sdcard_qspi_defconfig
index 0ca54c8,0ca54c8..fa1f71d
--- 1/configs/ls1088aqds_sdcard_qspi_defconfig
--- 2/configs/ls1088aqds_sdcard_qspi_defconfig
+++ b/configs/ls1088aqds_sdcard_qspi_defconfig
@@@ -11,6 -11,6 +11,12 @@@ CONFIG_ENV_OFFSET=0x30000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds"
  CONFIG_SPL_TEXT_BASE=0x1800a000
++CONFIG_FSL_LS_PPA=y
++CONFIG_SPL_MMC=y
++CONFIG_SPL_SERIAL=y
++CONFIG_SPL_DRIVERS_MISC=y
++CONFIG_SPL=y
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_SPL_VID=y
@@@ -18,12 -18,12 +24,6 @@@ CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_SPL_MMC=y
--CONFIG_SPL_SERIAL=y
--CONFIG_SPL_DRIVERS_MISC=y
--CONFIG_SPL=y
--CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1088aqds_tfa_defconfig
index e5063be,e5063be..af5ecad
--- 1/configs/ls1088aqds_tfa_defconfig
--- 2/configs/ls1088aqds_tfa_defconfig
+++ b/configs/ls1088aqds_tfa_defconfig
@@@ -11,18 -11,18 +11,17 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds"
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
++CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
++CONFIG_ENV_ADDR=0x20500000
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
--CONFIG_SPL_VID=y
  CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv"
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
--CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
--CONFIG_ENV_ADDR=0x20500000
--CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
index 8571eec,8571eec..b4cae48
--- 1/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
--- 2/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
@@@ -5,19 -5,19 +5,18 @@@ CONFIG_SYS_TEXT_BASE=0x2010000
  CONFIG_SYS_MALLOC_LEN=0x202000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb"
++CONFIG_FSL_LS_PPA=y
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_AHCI=y
++CONFIG_NXP_ESBC=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
--CONFIG_SPL_VID=y
  CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv"
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1088ardb_qspi_defconfig
index 1cd59ec,1cd59ec..452ee83
--- 1/configs/ls1088ardb_qspi_defconfig
--- 2/configs/ls1088ardb_qspi_defconfig
+++ b/configs/ls1088ardb_qspi_defconfig
@@@ -9,17 -9,17 +9,16 @@@ CONFIG_ENV_OFFSET=0x30000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb"
++CONFIG_FSL_LS_PPA=y
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_ENV_ADDR=0x20300000
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
--CONFIG_SPL_VID=y
  CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv"
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_ENV_ADDR=0x20300000
--CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
index 5b462a4,5b462a4..e36512e
--- 1/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
--- 2/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
@@@ -7,10 -7,10 +7,15 @@@ CONFIG_SPL_LIBCOMMON_SUPPORT=
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb"
  CONFIG_SPL_TEXT_BASE=0x1800a000
++CONFIG_FSL_LS_PPA=y
++CONFIG_SPL_MMC=y
++CONFIG_SPL_SERIAL=y
++CONFIG_SPL_DRIVERS_MISC=y
++CONFIG_SPL=y
++CONFIG_NXP_ESBC=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_SPL_VID=y
@@@ -18,11 -18,11 +23,6 @@@ CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_SPL_MMC=y
--CONFIG_SPL_SERIAL=y
--CONFIG_SPL_DRIVERS_MISC=y
--CONFIG_SPL=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1088ardb_sdcard_qspi_defconfig
index 455fce3,455fce3..2f81a13
--- 1/configs/ls1088ardb_sdcard_qspi_defconfig
--- 2/configs/ls1088ardb_sdcard_qspi_defconfig
+++ b/configs/ls1088ardb_sdcard_qspi_defconfig
@@@ -11,6 -11,6 +11,12 @@@ CONFIG_ENV_OFFSET=0x30000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb"
  CONFIG_SPL_TEXT_BASE=0x1800a000
++CONFIG_FSL_LS_PPA=y
++CONFIG_SPL_MMC=y
++CONFIG_SPL_SERIAL=y
++CONFIG_SPL_DRIVERS_MISC=y
++CONFIG_SPL=y
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_SPL_VID=y
@@@ -18,12 -18,12 +24,6 @@@ CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_SPL_MMC=y
--CONFIG_SPL_SERIAL=y
--CONFIG_SPL_DRIVERS_MISC=y
--CONFIG_SPL=y
--CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls1088ardb_tfa_SECURE_BOOT_defconfig
index 7354d41,7354d41..b5f556d
--- 1/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig
--- 2/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig
@@@ -7,20 -7,20 +7,19 @@@ CONFIG_SYS_MALLOC_LEN=0x20200
  CONFIG_SYS_MALLOC_F_LEN=0x6000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb"
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
++CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
++CONFIG_AHCI=y
++CONFIG_NXP_ESBC=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
--CONFIG_SPL_VID=y
  CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv"
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
--CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
--CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
@@@ -101,6 -101,6 +100,5 @@@ CONFIG_USB_XHCI_DWC3=
  CONFIG_USB_DWC3=y
  CONFIG_USB_GADGET=y
  CONFIG_RSA=y
--CONFIG_SPL_RSA=y
  CONFIG_RSA_SOFTWARE_EXP=y
  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

diff --cc configs/ls1088ardb_tfa_defconfig
index bb7e576,bb7e576..3af7828
--- 1/configs/ls1088ardb_tfa_defconfig
--- 2/configs/ls1088ardb_tfa_defconfig
+++ b/configs/ls1088ardb_tfa_defconfig
@@@ -11,18 -11,18 +11,17 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb"
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
++CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
++CONFIG_ENV_ADDR=0x20500000
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
--CONFIG_SPL_VID=y
  CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv"
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
--CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
--CONFIG_ENV_ADDR=0x20500000
--CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/ls2080aqds_SECURE_BOOT_defconfig
index 383e892,383e892..91cb2df
--- 1/configs/ls2080aqds_SECURE_BOOT_defconfig
--- 2/configs/ls2080aqds_SECURE_BOOT_defconfig
+++ b/configs/ls2080aqds_SECURE_BOOT_defconfig
@@@ -6,13 -6,13 +6,13 @@@ CONFIG_SYS_TEXT_BASE=0x3010000
  CONFIG_SYS_MALLOC_LEN=0x202000
  CONFIG_NR_DRAM_BANKS=3
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds"
++CONFIG_FSL_LS_PPA=y
++CONFIG_AHCI=y
++CONFIG_NXP_ESBC=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
--CONFIG_FSL_LS_PPA=y
--CONFIG_AHCI=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800fff0
  # CONFIG_SYS_MALLOC_F is not set

diff --cc configs/ls2080aqds_defconfig
index 92f1295,92f1295..8aef83a
--- 1/configs/ls2080aqds_defconfig
--- 2/configs/ls2080aqds_defconfig
+++ b/configs/ls2080aqds_defconfig
@@@ -8,12 -8,12 +8,12 @@@ CONFIG_NR_DRAM_BANKS=
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds"
--CONFIG_FSL_USE_PCA9547_MUX=y
--CONFIG_FSL_QIXIS=y
--# CONFIG_QIXIS_I2C_ACCESS is not set
  CONFIG_FSL_LS_PPA=y
  CONFIG_ENV_ADDR=0x80300000
  CONFIG_AHCI=y
++CONFIG_FSL_USE_PCA9547_MUX=y
++CONFIG_FSL_QIXIS=y
++# CONFIG_QIXIS_I2C_ACCESS is not set
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800fff0
  # CONFIG_SYS_MALLOC_F is not set

diff --cc configs/ls2080aqds_nand_defconfig
index 855d117,855d117..1d841af
--- 1/configs/ls2080aqds_nand_defconfig
--- 2/configs/ls2080aqds_nand_defconfig
+++ b/configs/ls2080aqds_nand_defconfig
@@@ -12,12 -12,12 +12,12 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0xE0000
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds"
  CONFIG_SPL_TEXT_BASE=0x1800a000
--CONFIG_FSL_USE_PCA9547_MUX=y
--CONFIG_FSL_QIXIS=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_AHCI=y
++CONFIG_FSL_USE_PCA9547_MUX=y
++CONFIG_FSL_QIXIS=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800fff0
  CONFIG_REMAKE_ELF=y

diff --cc configs/ls2080aqds_qspi_defconfig
index 8ca856c,8ca856c..302de32
--- 1/configs/ls2080aqds_qspi_defconfig
--- 2/configs/ls2080aqds_qspi_defconfig
+++ b/configs/ls2080aqds_qspi_defconfig
@@@ -10,9 -10,9 +10,9 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x300000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds"
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_FSL_QIXIS=y
--CONFIG_AHCI=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800fff0
  CONFIG_REMAKE_ELF=y

diff --cc configs/ls2080aqds_sdcard_defconfig
index bc9febc,bc9febc..e972842
--- 1/configs/ls2080aqds_sdcard_defconfig
--- 2/configs/ls2080aqds_sdcard_defconfig
+++ b/configs/ls2080aqds_sdcard_defconfig
@@@ -12,14 -12,14 +12,14 @@@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds"
  CONFIG_SPL_TEXT_BASE=0x1800a000
--CONFIG_FSL_USE_PCA9547_MUX=y
--CONFIG_FSL_QIXIS=y
  CONFIG_FSL_LS_PPA=y
  CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_AHCI=y
++CONFIG_FSL_USE_PCA9547_MUX=y
++CONFIG_FSL_QIXIS=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800fff0
  CONFIG_REMAKE_ELF=y

diff --cc configs/ls2080ardb_SECURE_BOOT_defconfig
index cb2d568,cb2d568..4fab4fb
--- 1/configs/ls2080ardb_SECURE_BOOT_defconfig
--- 2/configs/ls2080ardb_SECURE_BOOT_defconfig
+++ b/configs/ls2080ardb_SECURE_BOOT_defconfig
@@@ -6,8 -6,8 +6,10 @@@ CONFIG_SYS_TEXT_BASE=0x3010000
  CONFIG_SYS_MALLOC_LEN=0x202000
  CONFIG_NR_DRAM_BANKS=3
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-rdb"
++CONFIG_FSL_LS_PPA=y
++CONFIG_AHCI=y
++CONFIG_NXP_ESBC=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv"
@@@ -15,8 -15,8 +17,6 @@@ CONFIG_VOL_MONITOR_IR36021_READ=
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
--CONFIG_FSL_LS_PPA=y
--CONFIG_AHCI=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800fff0
  # CONFIG_SYS_MALLOC_F is not set

diff --cc configs/ls2080ardb_defconfig
index 136a101,136a101..c3327cd
--- 1/configs/ls2080ardb_defconfig
--- 2/configs/ls2080ardb_defconfig
+++ b/configs/ls2080ardb_defconfig
@@@ -8,6 -8,6 +8,9 @@@ CONFIG_NR_DRAM_BANKS=
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-rdb"
++CONFIG_FSL_LS_PPA=y
++CONFIG_ENV_ADDR=0x80300000
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv"
@@@ -15,9 -15,9 +18,6 @@@ CONFIG_VOL_MONITOR_IR36021_READ=
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
--CONFIG_FSL_LS_PPA=y
--CONFIG_ENV_ADDR=0x80300000
--CONFIG_AHCI=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800fff0
  # CONFIG_SYS_MALLOC_F is not set

diff --cc configs/ls2080ardb_nand_defconfig
index 9fcc5d6,9fcc5d6..6c7b49b
--- 1/configs/ls2080ardb_nand_defconfig
--- 2/configs/ls2080ardb_nand_defconfig
+++ b/configs/ls2080ardb_nand_defconfig
@@@ -12,6 -12,6 +12,10 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x200000
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-rdb"
  CONFIG_SPL_TEXT_BASE=0x1800a000
++CONFIG_SPL_SERIAL=y
++CONFIG_SPL_DRIVERS_MISC=y
++CONFIG_SPL=y
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv"
@@@ -19,10 -19,10 +23,6 @@@ CONFIG_VOL_MONITOR_IR36021_READ=
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
--CONFIG_SPL_SERIAL=y
--CONFIG_SPL_DRIVERS_MISC=y
--CONFIG_SPL=y
--CONFIG_AHCI=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800fff0
  CONFIG_REMAKE_ELF=y

diff --cc configs/ls2081ardb_defconfig
index 981217c,981217c..fb7faa4
--- 1/configs/ls2081ardb_defconfig
--- 2/configs/ls2081ardb_defconfig
+++ b/configs/ls2081ardb_defconfig
@@@ -9,15 -9,15 +9,15 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x300000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2081a-rdb"
++CONFIG_FSL_LS_PPA=y
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_AHCI=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800fff0
  # CONFIG_SYS_MALLOC_F is not set

diff --cc configs/ls2088aqds_tfa_defconfig
index 60e489f,60e489f..dc0f6f8
--- 1/configs/ls2088aqds_tfa_defconfig
--- 2/configs/ls2088aqds_tfa_defconfig
+++ b/configs/ls2088aqds_tfa_defconfig
@@@ -11,13 -11,13 +11,13 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds"
--CONFIG_FSL_USE_PCA9547_MUX=y
--CONFIG_FSL_QIXIS=y
--# CONFIG_QIXIS_I2C_ACCESS is not set
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
  CONFIG_ENV_ADDR=0x580500000
  CONFIG_AHCI=y
++CONFIG_FSL_USE_PCA9547_MUX=y
++CONFIG_FSL_QIXIS=y
++# CONFIG_QIXIS_I2C_ACCESS is not set
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y

diff --cc configs/ls2088ardb_qspi_SECURE_BOOT_defconfig
index 0ec945f,0ec945f..b86f816
--- 1/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig
--- 2/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig
@@@ -6,17 -6,17 +6,17 @@@ CONFIG_SYS_TEXT_BASE=0x2010000
  CONFIG_SYS_MALLOC_LEN=0x202000
  CONFIG_NR_DRAM_BANKS=3
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2088a-rdb-qspi"
++CONFIG_FSL_LS_PPA=y
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_AHCI=y
++CONFIG_NXP_ESBC=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_AHCI=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800fff0
  # CONFIG_SYS_MALLOC_F is not set

diff --cc configs/ls2088ardb_qspi_defconfig
index 651bd04,651bd04..9e08552
--- 1/configs/ls2088ardb_qspi_defconfig
--- 2/configs/ls2088ardb_qspi_defconfig
+++ b/configs/ls2088ardb_qspi_defconfig
@@@ -10,15 -10,15 +10,15 @@@ CONFIG_ENV_OFFSET=0x30000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2088a-rdb-qspi"
++CONFIG_FSL_LS_PPA=y
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_ENV_ADDR=0x20300000
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
--CONFIG_FSL_LS_PPA=y
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_ENV_ADDR=0x20300000
--CONFIG_AHCI=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800fff0
  # CONFIG_SYS_MALLOC_F is not set

diff --cc configs/ls2088ardb_tfa_SECURE_BOOT_defconfig
index 2f0ece6,2f0ece6..8d970cc
--- 1/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig
--- 2/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig
@@@ -8,9 -8,9 +8,13 @@@ CONFIG_SYS_MALLOC_LEN=0x20200
  CONFIG_SYS_MALLOC_F_LEN=0x6000
  CONFIG_NR_DRAM_BANKS=3
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2088a-rdb-qspi"
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
++CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
++CONFIG_AHCI=y
++CONFIG_NXP_ESBC=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv"
@@@ -18,10 -18,10 +22,6 @@@ CONFIG_VOL_MONITOR_IR36021_READ=
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
--CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
--CONFIG_AHCI=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
  CONFIG_FIT_VERBOSE=y
@@@ -103,6 -103,6 +103,5 @@@ CONFIG_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_RSA=y
--CONFIG_SPL_RSA=y
  CONFIG_RSA_SOFTWARE_EXP=y
  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

diff --cc configs/ls2088ardb_tfa_defconfig
index 37d3275,37d3275..d70d3cb
--- 1/configs/ls2088ardb_tfa_defconfig
--- 2/configs/ls2088ardb_tfa_defconfig
+++ b/configs/ls2088ardb_tfa_defconfig
@@@ -12,6 -12,6 +12,11 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2088a-rdb-qspi"
++CONFIG_QSPI_AHB_INIT=y
++CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
++CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
++CONFIG_ENV_ADDR=0x580500000
++CONFIG_AHCI=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
  CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv"
@@@ -19,11 -19,11 +24,6 @@@ CONFIG_VOL_MONITOR_IR36021_READ=
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
--CONFIG_QSPI_AHB_INIT=y
--CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
--CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
--CONFIG_ENV_ADDR=0x580500000
--CONFIG_AHCI=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
  CONFIG_FIT_VERBOSE=y

diff --cc configs/lx2160aqds_tfa_SECURE_BOOT_defconfig
index d65d611,d65d611..b2bc71a
--- 1/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig
--- 2/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig
@@@ -8,21 -8,21 +8,20 @@@ CONFIG_SYS_MALLOC_LEN=0x20200
  CONFIG_SYS_MALLOC_F_LEN=0x6000
  CONFIG_NR_DRAM_BANKS=3
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-qds"
++CONFIG_FSPI_AHB_EN_4BYTE=y
++CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
++CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
++CONFIG_AHCI=y
++CONFIG_OF_BOARD_FIXUP=y
++CONFIG_NXP_ESBC=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
--CONFIG_SPL_VID=y
  CONFIG_VID_FLS_ENV="lx2160aqds_vdd_mv"
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSPI_AHB_EN_4BYTE=y
--CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
--CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
--CONFIG_AHCI=y
--CONFIG_OF_BOARD_FIXUP=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
  CONFIG_FIT_VERBOSE=y
@@@ -108,6 -108,6 +107,5 @@@ CONFIG_USB_XHCI_HCD=
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_MAX_CONTROLLER_COUNT=2
  CONFIG_RSA=y
--CONFIG_SPL_RSA=y
  CONFIG_RSA_SOFTWARE_EXP=y
  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

diff --cc configs/lx2160aqds_tfa_defconfig
index 97cfb66,97cfb66..32e47c3
--- 1/configs/lx2160aqds_tfa_defconfig
--- 2/configs/lx2160aqds_tfa_defconfig
+++ b/configs/lx2160aqds_tfa_defconfig
@@@ -12,19 -12,19 +12,18 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-qds"
--CONFIG_FSL_USE_PCA9547_MUX=y
--CONFIG_VID=y
--CONFIG_SPL_VID=y
--CONFIG_VID_FLS_ENV="lx2160aqds_vdd_mv"
--CONFIG_VOL_MONITOR_LTC3882_READ=y
--CONFIG_VOL_MONITOR_LTC3882_SET=y
--CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
  CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
++CONFIG_FSL_USE_PCA9547_MUX=y
++CONFIG_VID=y
++CONFIG_VID_FLS_ENV="lx2160aqds_vdd_mv"
++CONFIG_VOL_MONITOR_LTC3882_READ=y
++CONFIG_VOL_MONITOR_LTC3882_SET=y
++CONFIG_FSL_QIXIS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
  CONFIG_FIT_VERBOSE=y

diff --cc configs/lx2160ardb_tfa_SECURE_BOOT_defconfig
index c340d9d,c340d9d..a758a4d
--- 1/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig
--- 2/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig
@@@ -8,22 -8,22 +8,21 @@@ CONFIG_SYS_MALLOC_LEN=0x20200
  CONFIG_SYS_MALLOC_F_LEN=0x6000
  CONFIG_NR_DRAM_BANKS=3
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-rdb"
--CONFIG_FSL_USE_PCA9547_MUX=y
--CONFIG_VID=y
--CONFIG_SPL_VID=y
--CONFIG_VID_FLS_ENV="lx2160ardb_vdd_mv"
--CONFIG_VOL_MONITOR_LTC3882_READ=y
--CONFIG_VOL_MONITOR_LTC3882_SET=y
--CONFIG_FSL_QIXIS=y
  CONFIG_EMC2305=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
++CONFIG_NXP_ESBC=y
++CONFIG_FSL_USE_PCA9547_MUX=y
++CONFIG_VID=y
++CONFIG_VID_FLS_ENV="lx2160ardb_vdd_mv"
++CONFIG_VOL_MONITOR_LTC3882_READ=y
++CONFIG_VOL_MONITOR_LTC3882_SET=y
++CONFIG_FSL_QIXIS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
  CONFIG_FIT_VERBOSE=y
@@@ -98,6 -98,6 +97,5 @@@ CONFIG_USB_XHCI_HCD=
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_MAX_CONTROLLER_COUNT=2
  CONFIG_RSA=y
--CONFIG_SPL_RSA=y
  CONFIG_RSA_SOFTWARE_EXP=y
  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

diff --cc configs/lx2160ardb_tfa_defconfig
index 3040382,3040382..e6e7940
--- 1/configs/lx2160ardb_tfa_defconfig
--- 2/configs/lx2160ardb_tfa_defconfig
+++ b/configs/lx2160ardb_tfa_defconfig
@@@ -12,13 -12,13 +12,6 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-rdb"
--CONFIG_FSL_USE_PCA9547_MUX=y
--CONFIG_VID=y
--CONFIG_SPL_VID=y
--CONFIG_VID_FLS_ENV="lx2160ardb_vdd_mv"
--CONFIG_VOL_MONITOR_LTC3882_READ=y
--CONFIG_VOL_MONITOR_LTC3882_SET=y
--CONFIG_FSL_QIXIS=y
  CONFIG_EMC2305=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
@@@ -26,6 -26,6 +19,12 @@@ CONFIG_SEC_FIRMWARE_ARMV8_PSCI=
  CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
++CONFIG_FSL_USE_PCA9547_MUX=y
++CONFIG_VID=y
++CONFIG_VID_FLS_ENV="lx2160ardb_vdd_mv"
++CONFIG_VOL_MONITOR_LTC3882_READ=y
++CONFIG_VOL_MONITOR_LTC3882_SET=y
++CONFIG_FSL_QIXIS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
  CONFIG_FIT_VERBOSE=y

diff --cc configs/lx2160ardb_tfa_stmm_defconfig
index efc0f91,efc0f91..bbdcb89
--- 1/configs/lx2160ardb_tfa_stmm_defconfig
--- 2/configs/lx2160ardb_tfa_stmm_defconfig
+++ b/configs/lx2160ardb_tfa_stmm_defconfig
@@@ -12,13 -12,13 +12,6 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-rdb"
--CONFIG_FSL_USE_PCA9547_MUX=y
--CONFIG_VID=y
--CONFIG_SPL_VID=y
--CONFIG_VID_FLS_ENV="lx2160ardb_vdd_mv"
--CONFIG_VOL_MONITOR_LTC3882_READ=y
--CONFIG_VOL_MONITOR_LTC3882_SET=y
--CONFIG_FSL_QIXIS=y
  CONFIG_EMC2305=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
@@@ -26,6 -26,6 +19,12 @@@ CONFIG_SEC_FIRMWARE_ARMV8_PSCI=
  CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
++CONFIG_FSL_USE_PCA9547_MUX=y
++CONFIG_VID=y
++CONFIG_VID_FLS_ENV="lx2160ardb_vdd_mv"
++CONFIG_VOL_MONITOR_LTC3882_READ=y
++CONFIG_VOL_MONITOR_LTC3882_SET=y
++CONFIG_FSL_QIXIS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
  CONFIG_FIT_VERBOSE=y

diff --cc configs/lx2162aqds_tfa_SECURE_BOOT_defconfig
index d0f92f8,d0f92f8..bb81e56
--- 1/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig
--- 2/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig
@@@ -8,21 -8,21 +8,20 @@@ CONFIG_SYS_MALLOC_LEN=0x20200
  CONFIG_SYS_MALLOC_F_LEN=0x6000
  CONFIG_NR_DRAM_BANKS=3
  CONFIG_ENV_SIZE=0x2000
--CONFIG_NXP_ESBC=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2162a-qds"
++CONFIG_FSPI_AHB_EN_4BYTE=y
++CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
++CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
++CONFIG_AHCI=y
++CONFIG_OF_BOARD_FIXUP=y
++CONFIG_NXP_ESBC=y
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_VID=y
--CONFIG_SPL_VID=y
  CONFIG_VID_FLS_ENV="lx2162aqds_vdd_mv"
  CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
--CONFIG_FSPI_AHB_EN_4BYTE=y
--CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
--CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
--CONFIG_AHCI=y
--CONFIG_OF_BOARD_FIXUP=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
  CONFIG_FIT_VERBOSE=y
@@@ -109,6 -109,6 +108,5 @@@ CONFIG_USB_XHCI_DWC3=
  CONFIG_WDT=y
  CONFIG_WDT_SBSA=y
  CONFIG_RSA=y
--CONFIG_SPL_RSA=y
  CONFIG_RSA_SOFTWARE_EXP=y
  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

diff --cc configs/lx2162aqds_tfa_defconfig
index df437a6,df437a6..216ac80
--- 1/configs/lx2162aqds_tfa_defconfig
--- 2/configs/lx2162aqds_tfa_defconfig
+++ b/configs/lx2162aqds_tfa_defconfig
@@@ -12,19 -12,19 +12,18 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2162a-qds"
--CONFIG_FSL_USE_PCA9547_MUX=y
--CONFIG_VID=y
--CONFIG_SPL_VID=y
--CONFIG_VID_FLS_ENV="lx2162aqds_vdd_mv"
--CONFIG_VOL_MONITOR_LTC3882_READ=y
--CONFIG_VOL_MONITOR_LTC3882_SET=y
--CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
  CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
++CONFIG_FSL_USE_PCA9547_MUX=y
++CONFIG_VID=y
++CONFIG_VID_FLS_ENV="lx2162aqds_vdd_mv"
++CONFIG_VOL_MONITOR_LTC3882_READ=y
++CONFIG_VOL_MONITOR_LTC3882_SET=y
++CONFIG_FSL_QIXIS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
  CONFIG_FIT_VERBOSE=y

diff --cc configs/lx2162aqds_tfa_verified_boot_defconfig
index c48c8a3,c48c8a3..b7a4238
--- 1/configs/lx2162aqds_tfa_verified_boot_defconfig
--- 2/configs/lx2162aqds_tfa_verified_boot_defconfig
+++ b/configs/lx2162aqds_tfa_verified_boot_defconfig
@@@ -12,19 -12,19 +12,18 @@@ CONFIG_ENV_OFFSET=0x50000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2162a-qds"
--CONFIG_FSL_USE_PCA9547_MUX=y
--CONFIG_VID=y
--CONFIG_SPL_VID=y
--CONFIG_VID_FLS_ENV="lx2162aqds_vdd_mv"
--CONFIG_VOL_MONITOR_LTC3882_READ=y
--CONFIG_VOL_MONITOR_LTC3882_SET=y
--CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
  CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
++CONFIG_FSL_USE_PCA9547_MUX=y
++CONFIG_VID=y
++CONFIG_VID_FLS_ENV="lx2162aqds_vdd_mv"
++CONFIG_VOL_MONITOR_LTC3882_READ=y
++CONFIG_VOL_MONITOR_LTC3882_SET=y
++CONFIG_FSL_QIXIS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
  CONFIG_FIT_SIGNATURE=y

diff --cc configs/openpiton_riscv64_defconfig
index 5605fbc,5672ffa..98d6818
--- 1/configs/openpiton_riscv64_defconfig
--- 2/configs/openpiton_riscv64_defconfig
+++ b/configs/openpiton_riscv64_defconfig
@@@ -73,7 -74,7 +74,6 @@@ CONFIG_RAM=
  CONFIG_DM_RTC=y
  CONFIG_SYS_NS16550=y
  CONFIG_FS_SQUASHFS=y
--CONFIG_SPL_TINY_MEMSET=y
  CONFIG_SHA1=y
  CONFIG_SHA256=y
  CONFIG_MD5=y

diff --cc configs/s5p_goni_defconfig
index c13602d,c13602d..05335d2
--- 1/configs/s5p_goni_defconfig
--- 2/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@@ -54,7 -54,7 +54,6 @@@ CONFIG_MTD=
  CONFIG_SAMSUNG_ONENAND=y
  CONFIG_DM_PMIC=y
  CONFIG_DM_PMIC_MAX8998=y
--CONFIG_PWM_S5P=y
  CONFIG_USB=y
  CONFIG_USB_GADGET=y
  CONFIG_USB_GADGET_MANUFACTURER="Samsung"

diff --cc configs/sam9x60ek_mmc_defconfig
index 718db00,718db00..c50aa6b
--- 1/configs/sam9x60ek_mmc_defconfig
--- 2/configs/sam9x60ek_mmc_defconfig
+++ b/configs/sam9x60ek_mmc_defconfig
@@@ -37,9 -37,9 +37,9 @@@ CONFIG_CMD_DM=
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y
--CONFIG_CMD_SF_TEST=y
  CONFIG_CMD_NAND=y
  CONFIG_CMD_NAND_TRIMFFS=y
++CONFIG_CMD_SF_TEST=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
  CONFIG_BOOTP_BOOTFILESIZE=y
@@@ -68,12 -68,12 +68,17 @@@ CONFIG_MMC_SDHCI=
  CONFIG_MMC_SDHCI_ATMEL=y
  CONFIG_MTD=y
  CONFIG_MTD_RAW_NAND=y
--CONFIG_SF_DEFAULT_MODE=0x0
--CONFIG_SF_DEFAULT_SPEED=50000000
  CONFIG_NAND_ATMEL=y
  CONFIG_ATMEL_NAND_HW_PMECC=y
  CONFIG_PMECC_CAP=8
  CONFIG_SYS_NAND_ONFI_DETECTION=y
++CONFIG_DM_SPI_FLASH=y
++CONFIG_SF_DEFAULT_SPEED=50000000
++CONFIG_SPI_FLASH_MACRONIX=y
++CONFIG_SPI_FLASH_SPANSION=y
++CONFIG_SPI_FLASH_STMICRO=y
++CONFIG_SPI_FLASH_SST=y
++CONFIG_SPI_FLASH_MTD=y
  CONFIG_PHY_MICREL=y
  CONFIG_DM_ETH=y
  CONFIG_MACB=y
@@@ -82,6 -82,6 +87,9 @@@ CONFIG_PINCTRL_AT91=
  CONFIG_DM_SERIAL=y
  CONFIG_DEBUG_UART_ANNOUNCE=y
  CONFIG_ATMEL_USART=y
++CONFIG_SPI=y
++CONFIG_DM_SPI=y
++CONFIG_ATMEL_QSPI=y
  CONFIG_SYSRESET=y
  CONFIG_SYSRESET_AT91=y
  CONFIG_TIMER=y
@@@ -91,13 -91,13 +99,3 @@@ CONFIG_W1_GPIO=
  CONFIG_W1_EEPROM=y
  CONFIG_W1_EEPROM_DS24XXX=y
  CONFIG_OF_LIBFDT_OVERLAY=y
--CONFIG_SPI=y
--CONFIG_DM_SPI=y
--CONFIG_SPI_FLASH=y
--CONFIG_DM_SPI_FLASH=y
--CONFIG_ATMEL_QSPI=y
--CONFIG_SPI_FLASH_MACRONIX=y
--CONFIG_SPI_FLASH_SPANSION=y
--CONFIG_SPI_FLASH_STMICRO=y
--CONFIG_SPI_FLASH_SST=y
--CONFIG_SPI_FLASH_MTD=y

diff --cc configs/sam9x60ek_nandflash_defconfig
index 00ce9df,00ce9df..d8d2383
--- 1/configs/sam9x60ek_nandflash_defconfig
--- 2/configs/sam9x60ek_nandflash_defconfig
+++ b/configs/sam9x60ek_nandflash_defconfig
@@@ -37,10 -37,10 +37,10 @@@ CONFIG_CMD_DM=
  # CONFIG_CMD_FLASH is not set
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_I2C=y
--CONFIG_CMD_SF_TEST=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_NAND=y
  CONFIG_CMD_NAND_TRIMFFS=y
++CONFIG_CMD_SF_TEST=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
  CONFIG_BOOTP_BOOTFILESIZE=y
@@@ -73,9 -73,9 +73,7 @@@ CONFIG_NAND_ATMEL=
  CONFIG_ATMEL_NAND_HW_PMECC=y
  CONFIG_PMECC_CAP=8
  CONFIG_SYS_NAND_ONFI_DETECTION=y
--CONFIG_PHY_MICREL=y
  CONFIG_DM_SPI_FLASH=y
--CONFIG_SF_DEFAULT_BUS=0
  CONFIG_SF_DEFAULT_SPEED=50000000
  CONFIG_SPI_FLASH_SFDP_SUPPORT=y
  CONFIG_SPI_FLASH_ATMEL=y
@@@ -83,6 -83,6 +81,7 @@@ CONFIG_SPI_FLASH_MACRONIX=
  CONFIG_SPI_FLASH_SPANSION=y
  CONFIG_SPI_FLASH_STMICRO=y
  CONFIG_SPI_FLASH_SST=y
++CONFIG_PHY_MICREL=y
  CONFIG_DM_ETH=y
  CONFIG_MACB=y
  CONFIG_PINCTRL=y
@@@ -90,11 -90,11 +89,11 @@@ CONFIG_PINCTRL_AT91=
  CONFIG_DM_SERIAL=y
  CONFIG_DEBUG_UART_ANNOUNCE=y
  CONFIG_ATMEL_USART=y
--CONFIG_SYSRESET=y
--CONFIG_SYSRESET_AT91=y
  CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_ATMEL_QSPI=y
++CONFIG_SYSRESET=y
++CONFIG_SYSRESET_AT91=y
  CONFIG_TIMER=y
  CONFIG_ATMEL_PIT_TIMER=y
  CONFIG_W1=y

diff --cc configs/sama5d2_icp_mmc_defconfig
index 57b76c3,57b76c3..86a49a1
--- 1/configs/sama5d2_icp_mmc_defconfig
--- 2/configs/sama5d2_icp_mmc_defconfig
+++ b/configs/sama5d2_icp_mmc_defconfig
@@@ -55,8 -55,8 +55,8 @@@ CONFIG_CMD_DM=
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_I2C=y
  # CONFIG_CMD_LOADS is not set
--CONFIG_CMD_SF_TEST=y
  CONFIG_CMD_MMC=y
++CONFIG_CMD_SF_TEST=y
  CONFIG_CMD_DHCP=y
  CONFIG_BOOTP_BOOTFILESIZE=y
  CONFIG_CMD_PING=y
@@@ -101,12 -101,12 +101,12 @@@ CONFIG_PINCTRL_AT91PIO4=
  CONFIG_DM_SERIAL=y
  CONFIG_DEBUG_UART_ANNOUNCE=y
  CONFIG_ATMEL_USART=y
--CONFIG_SYSRESET=y
--CONFIG_SPL_SYSRESET=y
--CONFIG_SYSRESET_AT91=y
  CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_ATMEL_QSPI=y
++CONFIG_SYSRESET=y
++CONFIG_SPL_SYSRESET=y
++CONFIG_SYSRESET_AT91=y
  CONFIG_TIMER=y
  CONFIG_SPL_TIMER=y
  CONFIG_ATMEL_TCB_TIMER=y

diff --cc configs/sandbox64_defconfig
index 46a9b16,46a9b16..6553568
--- 1/configs/sandbox64_defconfig
--- 2/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@@ -134,7 -134,7 +134,6 @@@ CONFIG_I2C_CROS_EC_LDO=
  CONFIG_DM_I2C_GPIO=y
  CONFIG_SYS_I2C_SANDBOX=y
  CONFIG_I2C_MUX=y
--CONFIG_SPL_I2C_MUX=y
  CONFIG_I2C_ARB_GPIO_CHALLENGE=y
  CONFIG_CROS_EC_KEYB=y
  CONFIG_I8042_KEYB=y

diff --cc configs/sandbox_defconfig
index 86204c7,86204c7..572cf8e
--- 1/configs/sandbox_defconfig
--- 2/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@@ -178,7 -178,7 +178,6 @@@ CONFIG_I2C_CROS_EC_LDO=
  CONFIG_DM_I2C_GPIO=y
  CONFIG_SYS_I2C_SANDBOX=y
  CONFIG_I2C_MUX=y
--CONFIG_SPL_I2C_MUX=y
  CONFIG_I2C_ARB_GPIO_CHALLENGE=y
  CONFIG_CROS_EC_KEYB=y
  CONFIG_I8042_KEYB=y

diff --cc configs/sandbox_flattree_defconfig
index 2c909ea,2c909ea..a71ce77
--- 1/configs/sandbox_flattree_defconfig
--- 2/configs/sandbox_flattree_defconfig
+++ b/configs/sandbox_flattree_defconfig
@@@ -106,7 -106,7 +106,6 @@@ CONFIG_I2C_CROS_EC_LDO=
  CONFIG_DM_I2C_GPIO=y
  CONFIG_SYS_I2C_SANDBOX=y
  CONFIG_I2C_MUX=y
--CONFIG_SPL_I2C_MUX=y
  CONFIG_I2C_ARB_GPIO_CHALLENGE=y
  CONFIG_CROS_EC_KEYB=y
  CONFIG_I8042_KEYB=y

diff --cc configs/smdkc100_defconfig
index 1ed3a8c,1ed3a8c..ae5983e
--- 1/configs/smdkc100_defconfig
--- 2/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@@ -40,4 -40,4 +40,3 @@@ CONFIG_MTD=
  CONFIG_SAMSUNG_ONENAND=y
  CONFIG_SMC911X=y
  CONFIG_SMC911X_BASE=0x98800300
--CONFIG_PWM_S5P=y

diff --cc configs/uDPU_defconfig
index a17bdd8,a17bdd8..2b2dc16
--- 1/configs/uDPU_defconfig
--- 2/configs/uDPU_defconfig
+++ b/configs/uDPU_defconfig
@@@ -102,4 -102,4 +102,3 @@@ CONFIG_USB_ETHER_MCS7830=
  CONFIG_USB_ETHER_RTL8152=y
  CONFIG_USB_ETHER_SMSC95XX=y
  CONFIG_LZO=y
--CONFIG_SPL_LZO=y

diff --cc configs/xilinx_versal_virt_defconfig
index c50ea96,b91955c..7f0bcb2
--- 1/configs/xilinx_versal_virt_defconfig
--- 2/configs/xilinx_versal_virt_defconfig
+++ b/configs/xilinx_versal_virt_defconfig
@@@ -5,7 -5,7 +5,6 @@@ CONFIG_SYS_INIT_SP_BSS_OFFSET=157286
  CONFIG_ARCH_VERSAL=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_SYS_MALLOC_F_LEN=0x100000
--CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-virt"
  CONFIG_CMD_FRU=y
  CONFIG_DEFINE_TCM_OCM_MMAP=y

diff --cc scripts/config_whitelist.txt
index b0d693a,6faa64f..0a2b817
--- 1/scripts/config_whitelist.txt
--- 2/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -1,18 -1,18 +1,6 @@@
  CONFIG_ARM_GIC_BASE_ADDRESS
  CONFIG_AUTO_ZRELADDR
  CONFIG_BOARDDIR
--CONFIG_BOOTSCRIPT_ADDR
--CONFIG_BOOTSCRIPT_COPY_RAM
--CONFIG_BOOTSCRIPT_HDR_ADDR
--CONFIG_BS_ADDR_DEVICE
--CONFIG_BS_ADDR_RAM
--CONFIG_BS_COPY_CMD
--CONFIG_BS_COPY_ENV
--CONFIG_BS_HDR_ADDR_DEVICE
--CONFIG_BS_HDR_ADDR_RAM
--CONFIG_BS_HDR_SIZE
--CONFIG_BS_SIZE
--CONFIG_CHAIN_BOOT_CMD
  CONFIG_DEFAULT
  CONFIG_DFU_ALT
  CONFIG_DFU_ALT_BOOT_EMMC
@@@ -24,15 -24,15 +12,7 @@@ CONFIG_DM9000_BYTE_SWAPPE
  CONFIG_DM9000_DEBUG
  CONFIG_DM9000_NO_SROM
  CONFIG_DM9000_USE_16BIT
--CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR
--CONFIG_DSP_CLUSTER_START
--CONFIG_DW_ALTDESCRIPTOR
--CONFIG_DW_GMAC_DEFAULT_DMA_PBL
--CONFIG_DW_WDT_BASE
  CONFIG_DW_WDT_CLOCK_KHZ
--CONFIG_EMU
--CONFIG_ENABLE_36BIT_PHYS
--CONFIG_ENABLE_MMU
  CONFIG_ENV_FLAGS_LIST_STATIC
  CONFIG_ENV_IS_EMBEDDED
  CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
@@@ -42,14 -42,14 +22,8 @@@ CONFIG_ENV_SETTINGS_V
  CONFIG_ENV_SETTINGS_V2
  CONFIG_ENV_SROM_BANK
  CONFIG_ENV_TOTAL_SIZE
--CONFIG_ESBC_ADDR_64BIT
--CONFIG_ESBC_HDR_LS
--CONFIG_ESDHC_DETECT_QUIRK
--CONFIG_ESDHC_HC_BLK_ADDR
  CONFIG_ET1100_BASE
  CONFIG_ETHBASE
--CONFIG_EXTRA_CLOCK
--CONFIG_EXTRA_ENV
  CONFIG_EXTRA_ENV_SETTINGS
  CONFIG_FB_ADDR
  CONFIG_FDTADDR
@@@ -71,7 -71,7 +45,6 @@@ CONFIG_FSL_CPL
  CONFIG_FSL_DEVICE_DISABLE
  CONFIG_FSL_DSPI1
  CONFIG_FSL_ESDHC_PIN_MUX
--CONFIG_FSL_FIXED_MMC_LOCATION
  CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
  CONFIG_FSL_IIM
  CONFIG_FSL_ISBC_KEY_EXT
@@@ -99,7 -99,7 +72,6 @@@ CONFIG_G_DNL_THOR_VENDOR_NU
  CONFIG_G_DNL_UMS_PRODUCT_NUM
  CONFIG_G_DNL_UMS_VENDOR_NUM
  CONFIG_HDMI_ENCODER_I2C_ADDR
--CONFIG_HETROGENOUS_CLUSTERS
  CONFIG_HIDE_LOGO_VERSION
  CONFIG_HIKEY_GPIO
  CONFIG_HOSTNAME
@@@ -270,10 -270,10 +242,6 @@@ CONFIG_IRAM_BAS
  CONFIG_IRAM_END
  CONFIG_IRAM_SIZE
  CONFIG_IRAM_TOP
--CONFIG_KEY_REVOCATION
--CONFIG_KIRKWOOD_EGIGA_INIT
--CONFIG_KIRKWOOD_PCIE_INIT
--CONFIG_KIRKWOOD_RGMII_PAD_1V8
  CONFIG_KM_BOARD_EXTRA_ENV
  CONFIG_KM_DEF_ARCH
  CONFIG_KM_DEF_BOOT_ARGS_CPU
@@@ -285,7 -285,7 +253,6 @@@ CONFIG_KM_DEF_ENV_CONSTANT
  CONFIG_KM_DEF_ENV_CPU
  CONFIG_KM_DEF_ENV_FLASH_BOOT
  CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
--CONFIG_KM_DISABLE_PCIE
  CONFIG_KM_ECC_MODE
  CONFIG_KM_NEW_ENV
  CONFIG_KM_ROOTFSSIZE
@@@ -306,7 -306,7 +273,6 @@@ CONFIG_KSNET_SERDES_SGMII2_BAS
  CONFIG_KSNET_SERDES_SGMII_BASE
  CONFIG_L1_INIT_RAM
  CONFIG_L2_CACHE
--CONFIG_LAYERSCAPE_NS_ACCESS
  CONFIG_LCD_ALIGNMENT
  CONFIG_LCD_MENU
  CONFIG_LD9040
@@@ -383,32 -383,32 +349,9 @@@ CONFIG_NUM_DSP_CPU
  CONFIG_ODROID_REV_AIN
  CONFIG_OTHBOOTARGS
  CONFIG_OVERWRITE_ETHADDR_ONCE
--CONFIG_PALMAS_POWER
  CONFIG_PCA953X
--CONFIG_PCI1
--CONFIG_PCI2
--CONFIG_PCIE1
--CONFIG_PCIE2
--CONFIG_PCIE3
--CONFIG_PCIE4
--CONFIG_PCIE_IMX
  CONFIG_PCIE_IMX_PERST_GPIO
  CONFIG_PCIE_IMX_POWER_GPIO
--CONFIG_PCI_CLK_FREQ
--CONFIG_PCI_CONFIG_HOST_BRIDGE
--CONFIG_PCI_GT64120
--CONFIG_PCI_IO_BUS
--CONFIG_PCI_IO_PHYS
--CONFIG_PCI_IO_SIZE
--CONFIG_PCI_MEM_BUS
--CONFIG_PCI_MEM_PHYS
--CONFIG_PCI_MEM_SIZE
--CONFIG_PCI_MSC01
--CONFIG_PCI_OHCI
--CONFIG_PCI_PREF_BUS
--CONFIG_PCI_PREF_PHYS
--CONFIG_PCI_PREF_SIZE
--CONFIG_PCI_SCAN_SHOW
  CONFIG_PEN_ADDR_BIG_ENDIAN
  CONFIG_PHY_BASE_ADR
  CONFIG_PHY_ET1011C_TX_CLK_FIX
@@@ -437,14 -437,14 +380,10 @@@ CONFIG_POWER_TPS6236
  CONFIG_POWER_TPS65090_EC
  CONFIG_POWER_TPS65218
  CONFIG_POWER_TPS65910
--CONFIG_PPC_CLUSTER_START
  CONFIG_PPC_SPINTABLE_COMPATIBLE
  CONFIG_PRAM
  CONFIG_PSRAM_SCFG
--CONFIG_PWM
--CONFIG_PXA_VGA
  CONFIG_QBMAN_CLK_DIV
--CONFIG_RAMBOOT_NAND
  CONFIG_RAMBOOT_SPIFLASH
  CONFIG_RAMBOOT_TEXT_BASE
  CONFIG_RAMDISK_ADDR
@@@ -464,7 -464,7 +403,6 @@@ CONFIG_RTC_MCFRRT
  CONFIG_RTC_MXS
  CONFIG_RTC_PT7C4338
  CONFIG_SAMA5D3_LCD_BASE
--CONFIG_SAMSUNG_ONENAND
  CONFIG_SANDBOX_ARCH
  CONFIG_SANDBOX_SDL
  CONFIG_SANDBOX_SPI_MAX_BUS
@@@ -475,15 -475,15 +413,12 @@@ CONFIG_SCIF_
  CONFIG_SCSI_DEV_LIST
  CONFIG_SC_TIMER_CLK
  CONFIG_SDRAM_OFFSET_FOR_RT
--CONFIG_SECBOOT
  CONFIG_SERIAL_BOOT
  CONFIG_SERIAL_SOFTWARE_FIFO
  CONFIG_SERVERIP
  CONFIG_SETUP_INITRD_TAG
--CONFIG_SET_BOOTARGS
  CONFIG_SET_DFU_ALT_BUF_LEN
  CONFIG_SH73A0
--CONFIG_SH7751_PCI
  CONFIG_SH_ETHER_ALIGNE_SIZE
  CONFIG_SH_ETHER_BASE_ADDR
  CONFIG_SH_ETHER_CACHE_INVALIDATE
@@@ -528,8 -528,8 +463,6 @@@ CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_SIZ
  CONFIG_STACKBASE
  CONFIG_STANDALONE_LOAD_ADDR
  CONFIG_STD_DEVICES_SETTINGS
--CONFIG_SYS_64BIT
--CONFIG_SYS_83XX_DDR_USES_CS0
  CONFIG_SYS_AMASK0
  CONFIG_SYS_AMASK1
  CONFIG_SYS_AMASK1_FINAL
@@@ -543,11 -543,11 +476,7 @@@ CONFIG_SYS_AT91_MAIN_CLOC
  CONFIG_SYS_AT91_PLLA
  CONFIG_SYS_AT91_PLLB
  CONFIG_SYS_AT91_SLOW_CLOCK
--CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
--CONFIG_SYS_AUXCORE_BOOTDATA
  CONFIG_SYS_BAUDRATE_TABLE
--CONFIG_SYS_BFTIC3_BASE
--CONFIG_SYS_BFTIC3_SIZE
  CONFIG_SYS_BMAN_CENA_BASE
  CONFIG_SYS_BMAN_CENA_SIZE
  CONFIG_SYS_BMAN_CINH_BASE
@@@ -559,13 -559,12 +488,8 @@@ CONFIG_SYS_BMAN_NUM_PORTAL
  CONFIG_SYS_BMAN_SP_CENA_SIZE
  CONFIG_SYS_BMAN_SP_CINH_SIZE
  CONFIG_SYS_BMAN_SWP_ISDR_REG
--CONFIG_SYS_BOOK3E_HV
--CONFIG_SYS_BOOTCOUNT_BE
--CONFIG_SYS_BOOTCOUNT_LE
  CONFIG_SYS_BOOTMAPSZ
--CONFIG_SYS_BOOTM_LEN
  CONFIG_SYS_BOOT_BLOCK
- CONFIG_SYS_BOOT_RAMDISK_HIGH
  CONFIG_SYS_CACHE_ACR0
  CONFIG_SYS_CACHE_ACR1
  CONFIG_SYS_CACHE_ACR2
@@@ -580,7 -579,7 +504,6 @@@ CONFIG_SYS_CL
  CONFIG_SYS_CLKTL_CBCDR
  CONFIG_SYS_CORE_SRAM
  CONFIG_SYS_CORE_SRAM_SIZE
--CONFIG_SYS_CPC_REINIT_F
  CONFIG_SYS_CPLD_AMASK
  CONFIG_SYS_CPLD_BASE
  CONFIG_SYS_CPLD_BASE_PHYS
@@@ -592,8 -591,8 +515,6 @@@ CONFIG_SYS_CPLD_FTIM
  CONFIG_SYS_CPLD_FTIM2
  CONFIG_SYS_CPLD_FTIM3
  CONFIG_SYS_CPLD_SIZE
--CONFIG_SYS_CPRI
--CONFIG_SYS_CPRI_CLK
  CONFIG_SYS_CPUSPEED
  CONFIG_SYS_CPU_CLK
  CONFIG_SYS_CS0_BASE
@@@ -681,10 -680,10 +602,8 @@@ CONFIG_SYS_DAVINCI_I2C_SPEED
  CONFIG_SYS_DCACHE_INV
  CONFIG_SYS_DCSRBAR
  CONFIG_SYS_DCSRBAR_PHYS
--CONFIG_SYS_DCSR_COP_CCP_ADDR
  CONFIG_SYS_DCSR_DCFG_ADDR
  CONFIG_SYS_DCSR_DCFG_OFFSET
--CONFIG_SYS_DCU_ADDR
  CONFIG_SYS_DDRCDR
  CONFIG_SYS_DDRCDR_VALUE
  CONFIG_SYS_DDRUA
@@@ -722,7 -721,7 +641,6 @@@ CONFIG_SYS_DDR_MODE_
  CONFIG_SYS_DDR_MODE_2_667
  CONFIG_SYS_DDR_MODE_2_800
  CONFIG_SYS_DDR_MODE_CONTROL
--CONFIG_SYS_DDR_RAW_TIMING
  CONFIG_SYS_DDR_RCW_1
  CONFIG_SYS_DDR_RCW_2
  CONFIG_SYS_DDR_SDRAM_BASE
@@@ -752,10 -751,10 +670,8 @@@ CONFIG_SYS_DDR_ZQ_CONTRO
  CONFIG_SYS_DEBUG
  CONFIG_SYS_DEBUG_SERVER_FW_ADDR
  CONFIG_SYS_DEBUG_SERVER_FW_IN_NOR
--CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
  CONFIG_SYS_DIALOG_PMIC_I2C_ADDR
  CONFIG_SYS_DIRECT_FLASH_TFTP
--CONFIG_SYS_DISCOVER_PHY
  CONFIG_SYS_DPAA_DCE
  CONFIG_SYS_DPAA_FMAN
  CONFIG_SYS_DPAA_PME
@@@ -770,12 -769,12 +686,10 @@@ CONFIG_SYS_DV_NOR_BOOT_CF
  CONFIG_SYS_EEPROM_BUS_NUM
  CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
  CONFIG_SYS_EEPROM_WREN
--CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
  CONFIG_SYS_ENET_BD_BASE
  CONFIG_SYS_ENV_SECT_SIZE
  CONFIG_SYS_ETHOC_BASE
  CONFIG_SYS_ETHOC_BUFFER_ADDR
--CONFIG_SYS_ETVPE_CLK
  CONFIG_SYS_EXCEPTION_VECTORS_HIGH
  CONFIG_SYS_FAST_CLK
  CONFIG_SYS_FDT_PAD
@@@ -881,19 -880,19 +795,15 @@@ CONFIG_SYS_FSL_CORENET_SERDES_ADD
  CONFIG_SYS_FSL_CORENET_SERDES_OFFSET
  CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY
  CONFIG_SYS_FSL_CORES_PER_CLUSTER
--CONFIG_SYS_FSL_CPC
  CONFIG_SYS_FSL_CPC_ADDR
  CONFIG_SYS_FSL_CPC_OFFSET
  CONFIG_SYS_FSL_CSU_ADDR
--CONFIG_SYS_FSL_DCFG_ADDR
  CONFIG_SYS_FSL_DCSR_DDR2_ADDR
  CONFIG_SYS_FSL_DCSR_DDR3_ADDR
--CONFIG_SYS_FSL_DCSR_DDR4_ADDR
  CONFIG_SYS_FSL_DCSR_DDR_ADDR
  CONFIG_SYS_FSL_DDR2_ADDR
  CONFIG_SYS_FSL_DDR3_ADDR
  CONFIG_SYS_FSL_DDR_ADDR
--CONFIG_SYS_FSL_DDR_EMU
  CONFIG_SYS_FSL_DDR_INTLV_256B
  CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS
  CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY
@@@ -935,7 -934,7 +845,6 @@@ CONFIG_SYS_FSL_FM2_RX2_1G_OFFSE
  CONFIG_SYS_FSL_FM2_RX3_1G_OFFSET
  CONFIG_SYS_FSL_FM2_RX4_1G_OFFSET
  CONFIG_SYS_FSL_FM2_RX5_1G_OFFSET
--CONFIG_SYS_FSL_FMAN_ADDR
  CONFIG_SYS_FSL_GUTS_ADDR
  CONFIG_SYS_FSL_IFC_BE
  CONFIG_SYS_FSL_IFC_LE
@@@ -952,7 -951,7 +861,6 @@@ CONFIG_SYS_FSL_OCRAM_SIZ
  CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS
  CONFIG_SYS_FSL_PAMU_OFFSET
  CONFIG_SYS_FSL_PCIE_COMPAT
--CONFIG_SYS_FSL_PCI_VER_3_X
  CONFIG_SYS_FSL_PEX_LUT_BE
  CONFIG_SYS_FSL_PEX_LUT_LE
  CONFIG_SYS_FSL_PMIC_I2C_ADDR
@@@ -977,16 -976,16 +885,9 @@@ CONFIG_SYS_FSL_SCFG_PIXCLKCR_OFFSE
  CONFIG_SYS_FSL_SCFG_PIXCLK_ADDR
  CONFIG_SYS_FSL_SEC_ADDR
  CONFIG_SYS_FSL_SEC_IDX_OFFSET
--CONFIG_SYS_FSL_SEC_MON_BE
--CONFIG_SYS_FSL_SEC_MON_LE
  CONFIG_SYS_FSL_SEC_OFFSET
  CONFIG_SYS_FSL_SERDES
  CONFIG_SYS_FSL_SERDES_ADDR
--CONFIG_SYS_FSL_SFP_BE
--CONFIG_SYS_FSL_SFP_LE
--CONFIG_SYS_FSL_SFP_VER_3_0
--CONFIG_SYS_FSL_SFP_VER_3_2
--CONFIG_SYS_FSL_SFP_VER_3_4
  CONFIG_SYS_FSL_SINGLE_SOURCE_CLK
  CONFIG_SYS_FSL_SRDS_3
  CONFIG_SYS_FSL_SRDS_4
@@@ -998,7 -997,7 +899,6 @@@ CONFIG_SYS_FSL_SRIO_MAX_PORT
  CONFIG_SYS_FSL_SRIO_MSG_UNIT_NUM
  CONFIG_SYS_FSL_SRIO_OB_WIN_NUM
  CONFIG_SYS_FSL_SRIO_OFFSET
--CONFIG_SYS_FSL_SRK_LE
  CONFIG_SYS_FSL_TBCLK_DIV
  CONFIG_SYS_FSL_TIMER_ADDR
  CONFIG_SYS_FSL_USB1_PHY_ENABLE
@@@ -1010,7 -1009,7 +910,6 @@@ CONFIG_SYS_FSL_WDOG_B
  CONFIG_SYS_FSL_WRIOP1_ADDR
  CONFIG_SYS_FSL_WRIOP1_MDIO1
  CONFIG_SYS_FSL_WRIOP1_MDIO2
--CONFIG_SYS_GIC400_ADDR
  CONFIG_SYS_GP1DIR
  CONFIG_SYS_GP1ODR
  CONFIG_SYS_GP2DIR
@@@ -1103,7 -1102,7 +1002,6 @@@ CONFIG_SYS_LOADS_BAUD_CHANG
  CONFIG_SYS_LOW
  CONFIG_SYS_LOWMEM_BASE
  CONFIG_SYS_LPAE_SDRAM_BASE
--CONFIG_SYS_LS1_DDR_BLOCK1_SIZE
  CONFIG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH
  CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS
  CONFIG_SYS_LS_MC_DPC_MAX_LENGTH
@@@ -1115,8 -1114,8 +1013,6 @@@ CONFIG_SYS_LS_MC_DRAM_DPL_OFFSE
  CONFIG_SYS_M41T11_BASE_YEAR
  CONFIG_SYS_MAIN_PWR_ON
  CONFIG_SYS_MAMR
--CONFIG_SYS_MAPLE
--CONFIG_SYS_MAPPED_RAM_BASE
  CONFIG_SYS_MASTER_CLOCK
  CONFIG_SYS_MATRIX_EBI0CSA_VAL
  CONFIG_SYS_MATRIX_EBICSA_VAL
@@@ -1131,9 -1130,9 +1027,7 @@@ CONFIG_SYS_MCK
  CONFIG_SYS_MCKR1_VAL
  CONFIG_SYS_MCKR2_VAL
  CONFIG_SYS_MCKR_CSS
--CONFIG_SYS_MDCNFG_VAL
  CONFIG_SYS_MDIO1_OFFSET
--CONFIG_SYS_MDREFR_VAL
  CONFIG_SYS_MEMAC_LITTLE_ENDIAN
  CONFIG_SYS_MEMORY_BASE
  CONFIG_SYS_MEMORY_SIZE
@@@ -1299,7 -1298,7 +1193,6 @@@ CONFIG_SYS_NUM_I2C_BUSE
  CONFIG_SYS_NVRAM_BASE_ADDR
  CONFIG_SYS_NVRAM_SIZE
  CONFIG_SYS_OBIR
--CONFIG_SYS_OHCI_SWAP_REG_ACCESS
  CONFIG_SYS_OMAP_ABE_SYSCK
  CONFIG_SYS_ONENAND_BASE
  CONFIG_SYS_ONENAND_BLOCK_SIZE
@@@ -1337,31 -1336,31 +1230,21 @@@ CONFIG_SYS_PCI1_MEM_VIR
  CONFIG_SYS_PCI2_ADDR
  CONFIG_SYS_PCIE
  CONFIG_SYS_PCIE1_ADDR
--CONFIG_SYS_PCIE1_BASE
  CONFIG_SYS_PCIE1_CFG_BASE
  CONFIG_SYS_PCIE1_CFG_SIZE
--CONFIG_SYS_PCIE1_IO_BASE
  CONFIG_SYS_PCIE1_IO_PHYS
--CONFIG_SYS_PCIE1_IO_SIZE
  CONFIG_SYS_PCIE1_IO_VIRT
--CONFIG_SYS_PCIE1_MEM_BASE
  CONFIG_SYS_PCIE1_MEM_PHYS
--CONFIG_SYS_PCIE1_MEM_SIZE
  CONFIG_SYS_PCIE1_MEM_VIRT
  CONFIG_SYS_PCIE1_PHYS_ADDR
  CONFIG_SYS_PCIE1_PHYS_BASE
  CONFIG_SYS_PCIE1_VIRT_ADDR
  CONFIG_SYS_PCIE2_ADDR
--CONFIG_SYS_PCIE2_BASE
  CONFIG_SYS_PCIE2_CFG_BASE
  CONFIG_SYS_PCIE2_CFG_SIZE
--CONFIG_SYS_PCIE2_IO_BASE
  CONFIG_SYS_PCIE2_IO_PHYS
--CONFIG_SYS_PCIE2_IO_SIZE
  CONFIG_SYS_PCIE2_IO_VIRT
--CONFIG_SYS_PCIE2_MEM_BASE
  CONFIG_SYS_PCIE2_MEM_PHYS
--CONFIG_SYS_PCIE2_MEM_SIZE
  CONFIG_SYS_PCIE2_MEM_VIRT
  CONFIG_SYS_PCIE2_PHYS_ADDR
  CONFIG_SYS_PCIE2_PHYS_BASE
@@@ -1381,20 -1380,20 +1264,6 @@@ CONFIG_SYS_PCIE4_MEM_PHY
  CONFIG_SYS_PCIE4_MEM_VIRT
  CONFIG_SYS_PCIE4_PHYS_ADDR
  CONFIG_SYS_PCIE_MMAP_SIZE
--CONFIG_SYS_PCI_IO_BASE
--CONFIG_SYS_PCI_IO_PHYS
--CONFIG_SYS_PCI_IO_SIZE
--CONFIG_SYS_PCI_MAP_END
--CONFIG_SYS_PCI_MAP_START
--CONFIG_SYS_PCI_MEM_BASE
--CONFIG_SYS_PCI_MEM_PHYS
--CONFIG_SYS_PCI_MEM_SIZE
--CONFIG_SYS_PCI_MMIO_BASE
--CONFIG_SYS_PCI_MMIO_PHYS
--CONFIG_SYS_PCI_MMIO_SIZE
--CONFIG_SYS_PCI_SLV_MEM_BUS
--CONFIG_SYS_PCI_SLV_MEM_LOCAL
--CONFIG_SYS_PCI_SLV_MEM_SIZE
  CONFIG_SYS_PDCNT
  CONFIG_SYS_PEHLPAR
  CONFIG_SYS_PIOC_PDR_VAL
@@@ -1428,7 -1427,7 +1297,6 @@@ CONFIG_SYS_QMAN_SP_CINH_SIZ
  CONFIG_SYS_QMAN_SWP_ISDR_REG
  CONFIG_SYS_QRIO_BASE
  CONFIG_SYS_QRIO_BASE_PHYS
--CONFIG_SYS_RAMBOOT
  CONFIG_SYS_RCAR_I2C0_BASE
  CONFIG_SYS_RCAR_I2C1_BASE
  CONFIG_SYS_RCAR_I2C2_BASE
@@@ -1514,7 -1513,7 +1382,6 @@@ CONFIG_SYS_SMC0_CYCLE0_VA
  CONFIG_SYS_SMC0_MODE0_VAL
  CONFIG_SYS_SMC0_PULSE0_VAL
  CONFIG_SYS_SMC0_SETUP0_VAL
--CONFIG_SYS_SPD_BUS_NUM
  CONFIG_SYS_SPI_ARGS_OFFS
  CONFIG_SYS_SPI_ARGS_SIZE
  CONFIG_SYS_SPI_BASE
@@@ -1551,8 -1550,8 +1418,6 @@@ CONFIG_SYS_TIMER_COUNTS_DOW
  CONFIG_SYS_TIMER_RATE
  CONFIG_SYS_TMPVIRT
  CONFIG_SYS_TSEC1_OFFSET
--CONFIG_SYS_TSEC2_OFFSET
--CONFIG_SYS_TSEC3_OFFSET
  CONFIG_SYS_TX_ETH_BUFFER
  CONFIG_SYS_UART2_ALT3_GPIO
  CONFIG_SYS_UART_PORT
@@@ -1566,14 -1565,14 +1431,7 @@@ CONFIG_SYS_UEC2_PHY_ADD
  CONFIG_SYS_UEC2_RX_CLK
  CONFIG_SYS_UEC2_TX_CLK
  CONFIG_SYS_UEC2_UCC_NUM
--CONFIG_SYS_ULB_CLK
--CONFIG_SYS_UNIFY_CACHE
--CONFIG_SYS_USB_OHCI_BOARD_INIT
--CONFIG_SYS_USB_OHCI_CPU_INIT
--CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
  CONFIG_SYS_USB_OHCI_REGS_BASE
--CONFIG_SYS_USB_OHCI_SLOT_NAME
--CONFIG_SYS_USE_NAND
  CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR
  CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN
  CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT
@@@ -1616,7 -1615,7 +1474,6 @@@ CONFIG_TEGRA_VDD_CORE_TPS62366A_SET
  CONFIG_TESTPIN_MASK
  CONFIG_TESTPIN_REG
  CONFIG_THOR_RESET_OFF
--CONFIG_THUNDERX
  CONFIG_TMU_TIMER
  CONFIG_TPM_TIS_BASE_ADDRESS
  CONFIG_TPS6586X_POWER
@@@ -1650,22 -1649,22 +1507,13 @@@ CONFIG_USBD_PRODUCTID_GSERIA
  CONFIG_USBD_PRODUCT_NAME
  CONFIG_USBD_VENDORID
  CONFIG_USBNET_DEV_ADDR
--CONFIG_USB_ATMEL
--CONFIG_USB_ATMEL_CLK_SEL_PLLB
--CONFIG_USB_ATMEL_CLK_SEL_UPLL
  CONFIG_USB_BOOTING
  CONFIG_USB_DEVICE
--CONFIG_USB_EHCI_EXYNOS
  CONFIG_USB_EXT2_BOOT
  CONFIG_USB_FAT_BOOT
  CONFIG_USB_GADGET_AT91
--CONFIG_USB_GADGET_DWC2_OTG_PHY
  CONFIG_USB_ISP1301_I2C_ADDR
--CONFIG_USB_OHCI_LPC32XX
--CONFIG_USB_OHCI_NEW
  CONFIG_USB_TTY
--CONFIG_USB_XHCI_EXYNOS
--CONFIG_USE_ONENAND_BOARD_INIT
  CONFIG_U_BOOT_HDR_SIZE
  CONFIG_VAR_SIZE_SPL
  CONFIG_VERY_BIG_RAM