Browse Source

configs: Resync with savedefconfig

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>
Tom Rini 2 years ago
parent
commit
a51673eb75
54 changed files with 37 additions and 55 deletions
  1. 1 2
      configs/T1024RDB_NAND_defconfig
  2. 1 1
      configs/T1024RDB_SDCARD_defconfig
  3. 1 1
      configs/T1024RDB_SPIFLASH_defconfig
  4. 1 1
      configs/T1024RDB_defconfig
  5. 1 1
      configs/T1042D4RDB_NAND_defconfig
  6. 0 1
      configs/T1042D4RDB_SDCARD_defconfig
  7. 1 1
      configs/T1042D4RDB_SPIFLASH_defconfig
  8. 1 1
      configs/T1042D4RDB_defconfig
  9. 0 1
      configs/T2080RDB_defconfig
  10. 1 1
      configs/kmcent2_defconfig
  11. 1 1
      configs/kmtegr1_defconfig
  12. 0 1
      configs/kontron_sl28_defconfig
  13. 0 1
      configs/ls1021aiot_qspi_defconfig
  14. 1 1
      configs/ls1021aiot_sdcard_defconfig
  15. 1 1
      configs/ls1021aqds_ddr4_nor_defconfig
  16. 1 1
      configs/ls1021aqds_ddr4_nor_lpuart_defconfig
  17. 0 1
      configs/ls1021aqds_nand_defconfig
  18. 1 1
      configs/ls1021aqds_nor_SECURE_BOOT_defconfig
  19. 1 1
      configs/ls1021aqds_nor_defconfig
  20. 1 1
      configs/ls1021aqds_nor_lpuart_defconfig
  21. 0 1
      configs/ls1021aqds_qspi_defconfig
  22. 0 1
      configs/ls1021aqds_sdcard_ifc_defconfig
  23. 0 1
      configs/ls1021aqds_sdcard_qspi_defconfig
  24. 1 1
      configs/ls1021atwr_nor_SECURE_BOOT_defconfig
  25. 1 1
      configs/ls1021atwr_nor_defconfig
  26. 1 1
      configs/ls1021atwr_nor_lpuart_defconfig
  27. 0 1
      configs/ls1021atwr_qspi_defconfig
  28. 1 1
      configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
  29. 0 1
      configs/ls1021atwr_sdcard_ifc_defconfig
  30. 0 1
      configs/ls1021atwr_sdcard_qspi_defconfig
  31. 0 1
      configs/ls1028aqds_tfa_SECURE_BOOT_defconfig
  32. 0 1
      configs/ls1028aqds_tfa_defconfig
  33. 0 1
      configs/ls1028ardb_tfa_SECURE_BOOT_defconfig
  34. 0 1
      configs/ls1028ardb_tfa_defconfig
  35. 1 1
      configs/ls1043aqds_defconfig
  36. 1 1
      configs/ls1043aqds_lpuart_defconfig
  37. 1 1
      configs/ls1043aqds_nor_ddr3_defconfig
  38. 1 1
      configs/ls1043aqds_sdcard_ifc_defconfig
  39. 1 1
      configs/ls1043aqds_sdcard_qspi_defconfig
  40. 1 1
      configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
  41. 1 1
      configs/ls1043aqds_tfa_defconfig
  42. 1 1
      configs/ls1043ardb_SECURE_BOOT_defconfig
  43. 1 1
      configs/ls1043ardb_defconfig
  44. 1 1
      configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
  45. 1 1
      configs/ls1043ardb_sdcard_defconfig
  46. 1 1
      configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
  47. 1 1
      configs/ls1043ardb_tfa_defconfig
  48. 0 1
      configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
  49. 1 1
      configs/pg_wcom_expu1_defconfig
  50. 1 1
      configs/pg_wcom_seli8_defconfig
  51. 1 1
      configs/stm32mp15_dhcom_basic_defconfig
  52. 1 1
      configs/stm32mp15_dhcor_basic_defconfig
  53. 1 1
      configs/vinco_defconfig
  54. 0 1
      scripts/config_whitelist.txt

+ 1 - 2
configs/T1024RDB_NAND_defconfig

@@ -92,10 +92,9 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
-ONFIG_SYS_FMAN_FW_ADDR=0x180000
-CONFIG_SYS_QE_FW_ADDR=0x200000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
+CONFIG_SYS_QE_FW_ADDR=0x200000
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y

+ 1 - 1
configs/T1024RDB_SDCARD_defconfig

@@ -89,9 +89,9 @@ CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x104000
-CONFIG_SYS_QE_FW_ADDR=0x124000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
+CONFIG_SYS_QE_FW_ADDR=0x124000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y

+ 1 - 1
configs/T1024RDB_SPIFLASH_defconfig

@@ -91,9 +91,9 @@ CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x110000
-CONFIG_SYS_QE_FW_ADDR=0x130000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
+CONFIG_SYS_QE_FW_ADDR=0x130000
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y

+ 1 - 1
configs/T1024RDB_defconfig

@@ -74,9 +74,9 @@ CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
-CONFIG_SYS_QE_FW_ADDR=0xEFE00000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
+CONFIG_SYS_QE_FW_ADDR=0xEFE00000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y

+ 1 - 1
configs/T1042D4RDB_NAND_defconfig

@@ -88,9 +88,9 @@ CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x280000
-CONFIG_SYS_QE_FW_ADDR=0x380000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
+CONFIG_SYS_QE_FW_ADDR=0x380000
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y

+ 0 - 1
configs/T1042D4RDB_SDCARD_defconfig

@@ -84,7 +84,6 @@ CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x10400
-ONFIG_SYS_QE_FW_ADDR=0x124000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y

+ 1 - 1
configs/T1042D4RDB_SPIFLASH_defconfig

@@ -86,9 +86,9 @@ CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x110000
-CONFIG_SYS_QE_FW_ADDR=0x130000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
+CONFIG_SYS_QE_FW_ADDR=0x130000
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y

+ 1 - 1
configs/T1042D4RDB_defconfig

@@ -69,9 +69,9 @@ CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
-CONFIG_SYS_QE_FW_ADDR=0xEFF10000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
+CONFIG_SYS_QE_FW_ADDR=0xEFF10000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y

+ 0 - 1
configs/T2080RDB_defconfig

@@ -73,7 +73,6 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
-ONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y

+ 1 - 1
configs/kmcent2_defconfig

@@ -71,12 +71,12 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0xE8020000
-CONFIG_SYS_QE_FW_ADDR=0xE8040000
 CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_PCI_REGION_MULTI_ENTRY=y
 CONFIG_PCIE_FSL=y
 CONFIG_U_QE=y
+CONFIG_SYS_QE_FW_ADDR=0xE8040000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y

+ 1 - 1
configs/kmtegr1_defconfig

@@ -178,7 +178,7 @@ CONFIG_QE_UEC=y
 # CONFIG_PCI is not set
 # CONFIG_PINCTRL_FULL is not set
 CONFIG_QE=y
-CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_SYS_QE_FW_ADDR=0xF00C0000
+CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_SYS_NS16550=y
 CONFIG_BCH=y

+ 0 - 1
configs/kontron_sl28_defconfig

@@ -82,7 +82,6 @@ CONFIG_PHY_FIXED=y
 CONFIG_DM_DSA=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FSL_ENETC=y
 CONFIG_MSCC_FELIX_SWITCH=y
 CONFIG_NVME=y
 CONFIG_PCIE_ECAM_GENERIC=y

+ 0 - 1
configs/ls1021aiot_qspi_defconfig

@@ -63,4 +63,3 @@ CONFIG_FSL_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_SYS_QE_FW_ADDR=0xf40000

+ 1 - 1
configs/ls1021aiot_sdcard_defconfig

@@ -70,6 +70,7 @@ CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0xf40000
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
@@ -79,4 +80,3 @@ CONFIG_FSL_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_SYS_QE_FW_ADDR=0xf40000

+ 1 - 1
configs/ls1021aqds_ddr4_nor_defconfig

@@ -76,6 +76,7 @@ CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_DM_SCSI=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
@@ -84,4 +85,3 @@ CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
-CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 1 - 1
configs/ls1021aqds_ddr4_nor_lpuart_defconfig

@@ -77,6 +77,7 @@ CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=y
@@ -84,4 +85,3 @@ CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
-CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 0 - 1
configs/ls1021aqds_nand_defconfig

@@ -105,4 +105,3 @@ CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
-CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 1 - 1
configs/ls1021aqds_nor_SECURE_BOOT_defconfig

@@ -75,6 +75,7 @@ CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
@@ -83,4 +84,3 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
-CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 1 - 1
configs/ls1021aqds_nor_defconfig

@@ -77,6 +77,7 @@ CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_DM_SCSI=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
@@ -85,4 +86,3 @@ CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
-CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 1 - 1
configs/ls1021aqds_nor_lpuart_defconfig

@@ -78,6 +78,7 @@ CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=y
@@ -85,4 +86,3 @@ CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
-CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 0 - 1
configs/ls1021aqds_qspi_defconfig

@@ -80,4 +80,3 @@ CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
-CONFIG_SYS_QE_FW_ADDR=0x940000

+ 0 - 1
configs/ls1021aqds_sdcard_ifc_defconfig

@@ -102,4 +102,3 @@ CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
-CONFIG_SYS_QE_FW_ADDR=0x940000

+ 0 - 1
configs/ls1021aqds_sdcard_qspi_defconfig

@@ -97,4 +97,3 @@ CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
-CONFIG_SYS_QE_FW_ADDR=0x940000

+ 1 - 1
configs/ls1021atwr_nor_SECURE_BOOT_defconfig

@@ -63,6 +63,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
@@ -70,4 +71,3 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
-CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 1 - 1
configs/ls1021atwr_nor_defconfig

@@ -65,6 +65,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_DM_SCSI=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
@@ -72,4 +73,3 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 1 - 1
configs/ls1021atwr_nor_lpuart_defconfig

@@ -67,10 +67,10 @@ CONFIG_TSEC_ENET=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 0 - 1
configs/ls1021atwr_qspi_defconfig

@@ -74,4 +74,3 @@ CONFIG_FSL_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_SYS_QE_FW_ADDR=0x940000

+ 1 - 1
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig

@@ -83,10 +83,10 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
-CONFIG_SYS_QE_FW_ADDR=0x940000

+ 0 - 1
configs/ls1021atwr_sdcard_ifc_defconfig

@@ -89,4 +89,3 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_SYS_QE_FW_ADDR=0x940000

+ 0 - 1
configs/ls1021atwr_sdcard_qspi_defconfig

@@ -90,4 +90,3 @@ CONFIG_FSL_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_SYS_QE_FW_ADDR=0x940000

+ 0 - 1
configs/ls1028aqds_tfa_SECURE_BOOT_defconfig

@@ -67,7 +67,6 @@ CONFIG_DM_MDIO=y
 CONFIG_DM_MDIO_MUX=y
 CONFIG_DM_DSA=y
 CONFIG_E1000=y
-CONFIG_FSL_ENETC=y
 CONFIG_MSCC_FELIX_SWITCH=y
 CONFIG_MDIO_MUX_I2CREG=y
 CONFIG_NVME=y

+ 0 - 1
configs/ls1028aqds_tfa_defconfig

@@ -72,7 +72,6 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_DM_MDIO_MUX=y
 CONFIG_DM_DSA=y
-CONFIG_FSL_ENETC=y
 CONFIG_E1000=y
 CONFIG_MSCC_FELIX_SWITCH=y
 CONFIG_MDIO_MUX_I2CREG=y

+ 0 - 1
configs/ls1028ardb_tfa_SECURE_BOOT_defconfig

@@ -63,7 +63,6 @@ CONFIG_DM_MDIO=y
 CONFIG_DM_DSA=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FSL_ENETC=y
 CONFIG_MSCC_FELIX_SWITCH=y
 CONFIG_NVME=y
 CONFIG_PCI=y

+ 0 - 1
configs/ls1028ardb_tfa_defconfig

@@ -69,7 +69,6 @@ CONFIG_DM_MDIO=y
 CONFIG_DM_DSA=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FSL_ENETC=y
 CONFIG_MSCC_FELIX_SWITCH=y
 CONFIG_NVME=y
 CONFIG_PCI=y

+ 1 - 1
configs/ls1043aqds_defconfig

@@ -70,11 +70,11 @@ CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
-CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y

+ 1 - 1
configs/ls1043aqds_lpuart_defconfig

@@ -71,11 +71,11 @@ CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
-CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y

+ 1 - 1
configs/ls1043aqds_nor_ddr3_defconfig

@@ -71,11 +71,11 @@ CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
-CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y

+ 1 - 1
configs/ls1043aqds_sdcard_ifc_defconfig

@@ -90,11 +90,11 @@ CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
-CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y

+ 1 - 1
configs/ls1043aqds_sdcard_qspi_defconfig

@@ -82,11 +82,11 @@ CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
-CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y

+ 1 - 1
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig

@@ -72,11 +72,11 @@ CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
-CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y

+ 1 - 1
configs/ls1043aqds_tfa_defconfig

@@ -82,11 +82,11 @@ CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
-CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y

+ 1 - 1
configs/ls1043ardb_SECURE_BOOT_defconfig

@@ -59,10 +59,10 @@ CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
-CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y

+ 1 - 1
configs/ls1043ardb_defconfig

@@ -62,10 +62,10 @@ CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
-CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y

+ 1 - 1
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig

@@ -76,9 +76,9 @@ CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
-CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y

+ 1 - 1
configs/ls1043ardb_sdcard_defconfig

@@ -81,10 +81,10 @@ CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
-CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y

+ 1 - 1
configs/ls1043ardb_tfa_SECURE_BOOT_defconfig

@@ -61,10 +61,10 @@ CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
-CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y

+ 1 - 1
configs/ls1043ardb_tfa_defconfig

@@ -67,10 +67,10 @@ CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
-CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y

+ 0 - 1
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig

@@ -78,7 +78,6 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
-ONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_PCIE_LAYERSCAPE_EP=y

+ 1 - 1
configs/pg_wcom_expu1_defconfig

@@ -71,7 +71,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_MII=y
 CONFIG_TSEC_ENET=y
+CONFIG_SYS_QE_FW_ADDR=0x60020000
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
-CONFIG_SYS_QE_FW_ADDR=0x60020000

+ 1 - 1
configs/pg_wcom_seli8_defconfig

@@ -71,7 +71,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_MII=y
 CONFIG_TSEC_ENET=y
+CONFIG_SYS_QE_FW_ADDR=0x60020000
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
-CONFIG_SYS_QE_FW_ADDR=0x60020000

+ 1 - 1
configs/stm32mp15_dhcom_basic_defconfig

@@ -149,8 +149,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0483
 CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-# CONFIG_BINMAN_FDT is not set
 CONFIG_FAT_WRITE=y
+# CONFIG_BINMAN_FDT is not set
 CONFIG_LZO=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
 # CONFIG_EFI_LOADER is not set

+ 1 - 1
configs/stm32mp15_dhcor_basic_defconfig

@@ -82,8 +82,8 @@ CONFIG_TFTP_BLOCKSIZE=1536
 CONFIG_STM32_ADC=y
 CONFIG_SPL_BLOCK_CACHE=y
 CONFIG_DFU_MMC=y
-CONFIG_DFU_RAM=y
 CONFIG_DFU_MTD=y
+CONFIG_DFU_RAM=y
 CONFIG_DFU_VIRT=y
 CONFIG_GPIO_HOG=y
 CONFIG_DM_HWSPINLOCK=y

+ 1 - 1
configs/vinco_defconfig

@@ -36,9 +36,9 @@ CONFIG_AT91_GPIO=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=50000000
-CONFIG_MACB=y
 CONFIG_PHY_SMSC=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_MACB=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y

+ 0 - 1
scripts/config_whitelist.txt

@@ -298,7 +298,6 @@ CONFIG_EXYNOS5
 CONFIG_EXYNOS5250
 CONFIG_EXYNOS5420
 CONFIG_EXYNOS5_DT
-CONFIG_EXYNOS7420
 CONFIG_EXYNOS_ACE_SHA
 CONFIG_EXYNOS_DP
 CONFIG_EXYNOS_FB