Browse Source

configs: fsl: migrate FMAN/QE specific defines to Kconfig

Use moveconfig.py script to convert CONFIG_SYS_FMAN_FW_ADDR,
CONFIG_SYS_QE_FW_ADDR and CONFIG_SYS_QE_FMAN_FW_LENGTH to Kconfig and
move these entries to defconfigs.

Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com>
[Rebased]
Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
Rajesh Bhagat 2 years ago
parent
commit
a97a071d10
100 changed files with 134 additions and 89 deletions
  1. 1 0
      configs/P2041RDB_NAND_defconfig
  2. 1 0
      configs/P2041RDB_SDCARD_defconfig
  3. 1 0
      configs/P2041RDB_SPIFLASH_defconfig
  4. 1 0
      configs/P2041RDB_defconfig
  5. 1 0
      configs/P3041DS_NAND_defconfig
  6. 1 0
      configs/P3041DS_SDCARD_defconfig
  7. 1 0
      configs/P3041DS_SPIFLASH_defconfig
  8. 1 0
      configs/P3041DS_defconfig
  9. 1 0
      configs/P4080DS_SDCARD_defconfig
  10. 1 0
      configs/P4080DS_SPIFLASH_defconfig
  11. 1 0
      configs/P4080DS_defconfig
  12. 1 0
      configs/P5040DS_NAND_defconfig
  13. 1 0
      configs/P5040DS_SDCARD_defconfig
  14. 1 0
      configs/P5040DS_SPIFLASH_defconfig
  15. 1 0
      configs/P5040DS_defconfig
  16. 2 0
      configs/T1024RDB_NAND_defconfig
  17. 2 0
      configs/T1024RDB_SDCARD_defconfig
  18. 2 0
      configs/T1024RDB_SPIFLASH_defconfig
  19. 2 0
      configs/T1024RDB_defconfig
  20. 2 0
      configs/T1042D4RDB_NAND_defconfig
  21. 2 0
      configs/T1042D4RDB_SDCARD_defconfig
  22. 2 0
      configs/T1042D4RDB_SPIFLASH_defconfig
  23. 2 0
      configs/T1042D4RDB_defconfig
  24. 1 0
      configs/T2080QDS_NAND_defconfig
  25. 1 0
      configs/T2080QDS_SDCARD_defconfig
  26. 1 0
      configs/T2080QDS_SECURE_BOOT_defconfig
  27. 1 0
      configs/T2080QDS_SPIFLASH_defconfig
  28. 1 0
      configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
  29. 1 0
      configs/T2080QDS_defconfig
  30. 1 0
      configs/T2080RDB_NAND_defconfig
  31. 1 0
      configs/T2080RDB_SDCARD_defconfig
  32. 1 0
      configs/T2080RDB_SPIFLASH_defconfig
  33. 1 0
      configs/T2080RDB_defconfig
  34. 1 0
      configs/T2080RDB_revD_NAND_defconfig
  35. 1 0
      configs/T2080RDB_revD_SDCARD_defconfig
  36. 1 0
      configs/T2080RDB_revD_SPIFLASH_defconfig
  37. 1 0
      configs/T2080RDB_revD_defconfig
  38. 1 0
      configs/T4240RDB_SDCARD_defconfig
  39. 1 0
      configs/T4240RDB_defconfig
  40. 2 0
      configs/kmcent2_defconfig
  41. 1 0
      configs/kmtegr1_defconfig
  42. 1 0
      configs/ls1021aiot_qspi_defconfig
  43. 1 0
      configs/ls1021aiot_sdcard_defconfig
  44. 1 0
      configs/ls1021aqds_ddr4_nor_defconfig
  45. 1 0
      configs/ls1021aqds_ddr4_nor_lpuart_defconfig
  46. 1 0
      configs/ls1021aqds_nand_defconfig
  47. 1 0
      configs/ls1021aqds_nor_SECURE_BOOT_defconfig
  48. 1 0
      configs/ls1021aqds_nor_defconfig
  49. 1 0
      configs/ls1021aqds_nor_lpuart_defconfig
  50. 1 0
      configs/ls1021aqds_qspi_defconfig
  51. 1 0
      configs/ls1021aqds_sdcard_ifc_defconfig
  52. 1 0
      configs/ls1021aqds_sdcard_qspi_defconfig
  53. 1 0
      configs/ls1021atwr_nor_SECURE_BOOT_defconfig
  54. 1 0
      configs/ls1021atwr_nor_defconfig
  55. 1 0
      configs/ls1021atwr_nor_lpuart_defconfig
  56. 1 0
      configs/ls1021atwr_qspi_defconfig
  57. 1 0
      configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
  58. 1 0
      configs/ls1021atwr_sdcard_ifc_defconfig
  59. 1 0
      configs/ls1021atwr_sdcard_qspi_defconfig
  60. 2 0
      configs/ls1043aqds_defconfig
  61. 2 0
      configs/ls1043aqds_lpuart_defconfig
  62. 1 0
      configs/ls1043aqds_nand_defconfig
  63. 2 0
      configs/ls1043aqds_nor_ddr3_defconfig
  64. 1 0
      configs/ls1043aqds_qspi_defconfig
  65. 2 0
      configs/ls1043aqds_sdcard_ifc_defconfig
  66. 2 0
      configs/ls1043aqds_sdcard_qspi_defconfig
  67. 2 0
      configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
  68. 2 0
      configs/ls1043aqds_tfa_defconfig
  69. 2 0
      configs/ls1043ardb_SECURE_BOOT_defconfig
  70. 2 0
      configs/ls1043ardb_defconfig
  71. 1 0
      configs/ls1043ardb_nand_SECURE_BOOT_defconfig
  72. 1 0
      configs/ls1043ardb_nand_defconfig
  73. 2 0
      configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
  74. 2 0
      configs/ls1043ardb_sdcard_defconfig
  75. 2 0
      configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
  76. 2 0
      configs/ls1043ardb_tfa_defconfig
  77. 1 0
      configs/ls1046aqds_SECURE_BOOT_defconfig
  78. 1 0
      configs/ls1046aqds_defconfig
  79. 1 0
      configs/ls1046aqds_lpuart_defconfig
  80. 1 0
      configs/ls1046aqds_nand_defconfig
  81. 1 0
      configs/ls1046aqds_qspi_defconfig
  82. 1 0
      configs/ls1046aqds_sdcard_ifc_defconfig
  83. 1 0
      configs/ls1046aqds_sdcard_qspi_defconfig
  84. 1 0
      configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
  85. 1 0
      configs/ls1046aqds_tfa_defconfig
  86. 1 0
      configs/ls1046ardb_emmc_defconfig
  87. 1 0
      configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
  88. 1 0
      configs/ls1046ardb_qspi_defconfig
  89. 1 0
      configs/ls1046ardb_qspi_spl_defconfig
  90. 1 0
      configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
  91. 1 0
      configs/ls1046ardb_sdcard_defconfig
  92. 1 0
      configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
  93. 1 0
      configs/ls1046ardb_tfa_defconfig
  94. 1 0
      configs/pg_wcom_expu1_defconfig
  95. 1 0
      configs/pg_wcom_seli8_defconfig
  96. 10 0
      drivers/net/Kconfig
  97. 4 0
      drivers/qe/Kconfig
  98. 1 30
      include/configs/P2041RDB.h
  99. 1 31
      include/configs/T102xRDB.h
  100. 1 28
      include/configs/T104xRDB.h

+ 1 - 0
configs/P2041RDB_NAND_defconfig

@@ -62,6 +62,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x100000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y

+ 1 - 0
configs/P2041RDB_SDCARD_defconfig

@@ -61,6 +61,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xD2000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y

+ 1 - 0
configs/P2041RDB_SPIFLASH_defconfig

@@ -62,6 +62,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x110000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y

+ 1 - 0
configs/P2041RDB_defconfig

@@ -57,6 +57,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y

+ 1 - 0
configs/P3041DS_NAND_defconfig

@@ -60,6 +60,7 @@ CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x100000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/P3041DS_SDCARD_defconfig

@@ -59,6 +59,7 @@ CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xD2000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/P3041DS_SPIFLASH_defconfig

@@ -60,6 +60,7 @@ CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x110000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/P3041DS_defconfig

@@ -55,6 +55,7 @@ CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/P4080DS_SDCARD_defconfig

@@ -58,6 +58,7 @@ CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xD2000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/P4080DS_SPIFLASH_defconfig

@@ -59,6 +59,7 @@ CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x110000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/P4080DS_defconfig

@@ -54,6 +54,7 @@ CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/P5040DS_NAND_defconfig

@@ -61,6 +61,7 @@ CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x100000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/P5040DS_SDCARD_defconfig

@@ -59,6 +59,7 @@ CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xD2000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/P5040DS_SPIFLASH_defconfig

@@ -60,6 +60,7 @@ CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x110000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/P5040DS_defconfig

@@ -55,6 +55,7 @@ CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 2 - 0
configs/T1024RDB_NAND_defconfig

@@ -92,6 +92,8 @@ 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_FMAN_FW_IN_NAND=y

+ 2 - 0
configs/T1024RDB_SDCARD_defconfig

@@ -88,6 +88,8 @@ CONFIG_DM_ETH=y
 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_FMAN_FW_IN_MMC=y

+ 2 - 0
configs/T1024RDB_SPIFLASH_defconfig

@@ -90,6 +90,8 @@ CONFIG_DM_ETH=y
 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_FMAN_FW_IN_SPIFLASH=y

+ 2 - 0
configs/T1024RDB_defconfig

@@ -73,6 +73,8 @@ CONFIG_DM_ETH=y
 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_FMAN_FW_IN_NOR=y

+ 2 - 0
configs/T1042D4RDB_NAND_defconfig

@@ -87,6 +87,8 @@ CONFIG_DM_MDIO=y
 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_FMAN_FW_IN_NAND=y

+ 2 - 0
configs/T1042D4RDB_SDCARD_defconfig

@@ -83,6 +83,8 @@ CONFIG_DM_MDIO=y
 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

+ 2 - 0
configs/T1042D4RDB_SPIFLASH_defconfig

@@ -85,6 +85,8 @@ CONFIG_DM_MDIO=y
 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_FMAN_FW_IN_SPIFLASH=y

+ 2 - 0
configs/T1042D4RDB_defconfig

@@ -68,6 +68,8 @@ CONFIG_DM_MDIO=y
 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_FMAN_FW_IN_NOR=y

+ 1 - 0
configs/T2080QDS_NAND_defconfig

@@ -86,6 +86,7 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x160000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/T2080QDS_SDCARD_defconfig

@@ -82,6 +82,7 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x104000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/T2080QDS_SECURE_BOOT_defconfig

@@ -66,6 +66,7 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/T2080QDS_SPIFLASH_defconfig

@@ -84,6 +84,7 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x110000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig

@@ -59,6 +59,7 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xFFE00000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/T2080QDS_defconfig

@@ -67,6 +67,7 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/T2080RDB_NAND_defconfig

@@ -93,6 +93,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x180000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y

+ 1 - 0
configs/T2080RDB_SDCARD_defconfig

@@ -89,6 +89,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x104000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y

+ 1 - 0
configs/T2080RDB_SPIFLASH_defconfig

@@ -91,6 +91,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x110000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y

+ 1 - 0
configs/T2080RDB_defconfig

@@ -73,6 +73,7 @@ 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 - 0
configs/T2080RDB_revD_NAND_defconfig

@@ -94,6 +94,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x180000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/T2080RDB_revD_SDCARD_defconfig

@@ -90,6 +90,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x104000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/T2080RDB_revD_SPIFLASH_defconfig

@@ -92,6 +92,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x110000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/T2080RDB_revD_defconfig

@@ -74,6 +74,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/T4240RDB_SDCARD_defconfig

@@ -76,6 +76,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x104000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 1 - 0
configs/T4240RDB_defconfig

@@ -61,6 +61,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y

+ 2 - 0
configs/kmcent2_defconfig

@@ -69,6 +69,8 @@ CONFIG_DM_ETH=y
 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

+ 1 - 0
configs/kmtegr1_defconfig

@@ -179,5 +179,6 @@ CONFIG_QE_UEC=y
 # 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_NS16550=y
 CONFIG_BCH=y

+ 1 - 0
configs/ls1021aiot_qspi_defconfig

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

+ 1 - 0
configs/ls1021aiot_sdcard_defconfig

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

+ 1 - 0
configs/ls1021aqds_ddr4_nor_defconfig

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

+ 1 - 0
configs/ls1021aqds_ddr4_nor_lpuart_defconfig

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

+ 1 - 0
configs/ls1021aqds_nand_defconfig

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

+ 1 - 0
configs/ls1021aqds_nor_SECURE_BOOT_defconfig

@@ -83,3 +83,4 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 1 - 0
configs/ls1021aqds_nor_defconfig

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

+ 1 - 0
configs/ls1021aqds_nor_lpuart_defconfig

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

+ 1 - 0
configs/ls1021aqds_qspi_defconfig

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

+ 1 - 0
configs/ls1021aqds_sdcard_ifc_defconfig

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

+ 1 - 0
configs/ls1021aqds_sdcard_qspi_defconfig

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

+ 1 - 0
configs/ls1021atwr_nor_SECURE_BOOT_defconfig

@@ -70,3 +70,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 1 - 0
configs/ls1021atwr_nor_defconfig

@@ -72,3 +72,4 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 1 - 0
configs/ls1021atwr_nor_lpuart_defconfig

@@ -73,3 +73,4 @@ CONFIG_FSL_LPUART=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_SYS_QE_FW_ADDR=0x60940000

+ 1 - 0
configs/ls1021atwr_qspi_defconfig

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

+ 1 - 0
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig

@@ -89,3 +89,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
+CONFIG_SYS_QE_FW_ADDR=0x940000

+ 1 - 0
configs/ls1021atwr_sdcard_ifc_defconfig

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

+ 1 - 0
configs/ls1021atwr_sdcard_qspi_defconfig

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

+ 2 - 0
configs/ls1043aqds_defconfig

@@ -69,6 +69,8 @@ CONFIG_PHY_REALTEK=y
 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

+ 2 - 0
configs/ls1043aqds_lpuart_defconfig

@@ -70,6 +70,8 @@ CONFIG_PHY_REALTEK=y
 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

+ 1 - 0
configs/ls1043aqds_nand_defconfig

@@ -90,6 +90,7 @@ CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y

+ 2 - 0
configs/ls1043aqds_nor_ddr3_defconfig

@@ -70,6 +70,8 @@ CONFIG_PHY_REALTEK=y
 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

+ 1 - 0
configs/ls1043aqds_qspi_defconfig

@@ -64,6 +64,7 @@ CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y

+ 2 - 0
configs/ls1043aqds_sdcard_ifc_defconfig

@@ -89,6 +89,8 @@ CONFIG_PHY_REALTEK=y
 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

+ 2 - 0
configs/ls1043aqds_sdcard_qspi_defconfig

@@ -81,6 +81,8 @@ CONFIG_PHY_REALTEK=y
 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

+ 2 - 0
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig

@@ -71,6 +71,8 @@ CONFIG_PHY_REALTEK=y
 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

+ 2 - 0
configs/ls1043aqds_tfa_defconfig

@@ -81,6 +81,8 @@ CONFIG_PHY_REALTEK=y
 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

+ 2 - 0
configs/ls1043ardb_SECURE_BOOT_defconfig

@@ -58,6 +58,8 @@ CONFIG_DM_MDIO=y
 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

+ 2 - 0
configs/ls1043ardb_defconfig

@@ -61,6 +61,8 @@ CONFIG_DM_ETH=y
 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

+ 1 - 0
configs/ls1043ardb_nand_SECURE_BOOT_defconfig

@@ -74,6 +74,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y

+ 1 - 0
configs/ls1043ardb_nand_defconfig

@@ -82,6 +82,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y

+ 2 - 0
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig

@@ -75,6 +75,8 @@ CONFIG_DM_MDIO=y
 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_FMAN_FW_IN_MMC=y

+ 2 - 0
configs/ls1043ardb_sdcard_defconfig

@@ -80,6 +80,8 @@ CONFIG_DM_ETH=y
 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

+ 2 - 0
configs/ls1043ardb_tfa_SECURE_BOOT_defconfig

@@ -60,6 +60,8 @@ CONFIG_DM_MDIO=y
 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

+ 2 - 0
configs/ls1043ardb_tfa_defconfig

@@ -66,6 +66,8 @@ CONFIG_DM_ETH=y
 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

+ 1 - 0
configs/ls1046aqds_SECURE_BOOT_defconfig

@@ -69,6 +69,7 @@ CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y

+ 1 - 0
configs/ls1046aqds_defconfig

@@ -72,6 +72,7 @@ CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y

+ 1 - 0
configs/ls1046aqds_lpuart_defconfig

@@ -73,6 +73,7 @@ CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y

+ 1 - 0
configs/ls1046aqds_nand_defconfig

@@ -92,6 +92,7 @@ CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y

+ 1 - 0
configs/ls1046aqds_qspi_defconfig

@@ -68,6 +68,7 @@ CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y

+ 1 - 0
configs/ls1046aqds_sdcard_ifc_defconfig

@@ -92,6 +92,7 @@ CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y

+ 1 - 0
configs/ls1046aqds_sdcard_qspi_defconfig

@@ -86,6 +86,7 @@ CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y

+ 1 - 0
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig

@@ -73,6 +73,7 @@ CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y

+ 1 - 0
configs/ls1046aqds_tfa_defconfig

@@ -84,6 +84,7 @@ CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y

+ 1 - 0
configs/ls1046ardb_emmc_defconfig

@@ -81,6 +81,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y

+ 1 - 0
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig

@@ -63,6 +63,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y

+ 1 - 0
configs/ls1046ardb_qspi_defconfig

@@ -67,6 +67,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y

+ 1 - 0
configs/ls1046ardb_qspi_spl_defconfig

@@ -85,6 +85,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y

+ 1 - 0
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig

@@ -78,6 +78,7 @@ 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 - 0
configs/ls1046ardb_sdcard_defconfig

@@ -79,6 +79,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y

+ 1 - 0
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig

@@ -60,6 +60,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y

+ 1 - 0
configs/ls1046ardb_tfa_defconfig

@@ -66,6 +66,7 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
+CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y

+ 1 - 0
configs/pg_wcom_expu1_defconfig

@@ -74,3 +74,4 @@ CONFIG_TSEC_ENET=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_QE_FW_ADDR=0x60020000

+ 1 - 0
configs/pg_wcom_seli8_defconfig

@@ -74,3 +74,4 @@ CONFIG_TSEC_ENET=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_QE_FW_ADDR=0x60020000

+ 10 - 0
drivers/net/Kconfig

@@ -344,6 +344,16 @@ config FMAN_ENET
 	help
 	  This driver support the Freescale FMan Ethernet controller
 
+config SYS_FMAN_FW_ADDR
+	hex "FMAN Firmware Address"
+	depends on FMAN_ENET
+	default 0x0
+
+config SYS_QE_FMAN_FW_LENGTH
+	hex "FMAN QE Firmware length"
+	depends on FMAN_ENET || QE || U_QE
+	default 0x10000
+
 config FTMAC100
 	bool "Ftmac100 Ethernet Support"
 	help

+ 4 - 0
drivers/qe/Kconfig

@@ -18,6 +18,10 @@ config U_QE
 	help
 	  Choose this option to add support for U QUICC Engine.
 
+config SYS_QE_FW_ADDR
+	hex "QE Firmware Address"
+	depends on FMAN_ENET || QE || U_QE
+	default 0x0
 choice
 	prompt "QUICC Engine FMan ethernet firmware location"
 	depends on FMAN_ENET || QE

+ 1 - 30
include/configs/P2041RDB.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2011-2012 Freescale Semiconductor, Inc.
- * Copyright 2020 NXP
+ * Copyright 2020-2021 NXP
  */
 
 /*
@@ -361,35 +361,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_DPAA_PME
-/* Default address of microcode for the Linux Fman driver */
-#if defined(CONFIG_SPIFLASH)
-/*
- * env is stored at 0x100000, sector size is 0x10000, ucode is stored after
- * env, so we got 0x110000.
- */
-#define CONFIG_SYS_FMAN_FW_ADDR	0x110000
-#elif defined(CONFIG_SDCARD)
-/*
- * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is
- * about 825KB (1650 blocks), Env is stored after the image, and the env size is
- * 0x2000 (16 blocks), 8 + 1650 + 16 = 1674, enlarge it to 1680.
- */
-#define CONFIG_SYS_FMAN_FW_ADDR	(512 * 1680)
-#elif defined(CONFIG_MTD_RAW_NAND)
-#define CONFIG_SYS_FMAN_FW_ADDR	(8 * (128 * 1024))
-#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-/*
- * Slave has no ucode locally, it can fetch this from remote. When implementing
- * in two corenet boards, slave's ucode could be stored in master's memory
- * space, the address can be mapped from slave TLB->slave LAW->
- * slave SRIO or PCIE outbound window->master inbound window->
- * master LAW->the ucode address in master's memory space.
- */
-#define CONFIG_SYS_FMAN_FW_ADDR	0xFFE00000
-#else
-#define CONFIG_SYS_FMAN_FW_ADDR	0xEFF00000
-#endif
-#define CONFIG_SYS_QE_FMAN_FW_LENGTH	0x10000
 #define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 
 #ifdef CONFIG_PCI

+ 1 - 31
include/configs/T102xRDB.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2014 Freescale Semiconductor, Inc.
- * Copyright 2020 NXP
+ * Copyright 2020-2021 NXP
  */
 
 /*
@@ -500,36 +500,6 @@ unsigned long get_board_sys_clk(void);
 
 #define CONFIG_SYS_DPAA_FMAN
 
-/* Default address of microcode for the Linux FMan driver */
-#if defined(CONFIG_SPIFLASH)
-/*
- * env is stored at 0x100000, sector size is 0x10000, ucode is stored after
- * env, so we got 0x110000.
- */
-#define CONFIG_SYS_FMAN_FW_ADDR	0x110000
-#define CONFIG_SYS_QE_FW_ADDR	0x130000
-#elif defined(CONFIG_SDCARD)
-/*
- * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is
- * about 1MB (2048 blocks), Env is stored after the image, and the env size is
- * 0x2000 (16 blocks), 8 + 2048 + 16 = 2072, enlarge it to 2080(0x820).
- */
-#define CONFIG_SYS_FMAN_FW_ADDR		(512 * 0x820)
-#define CONFIG_SYS_QE_FW_ADDR		(512 * 0x920)
-#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-/*
- * Slave has no ucode locally, it can fetch this from remote. When implementing
- * in two corenet boards, slave's ucode could be stored in master's memory
- * space, the address can be mapped from slave TLB->slave LAW->
- * slave SRIO or PCIE outbound window->master inbound window->
- * master LAW->the ucode address in master's memory space.
- */
-#define CONFIG_SYS_FMAN_FW_ADDR		0xFFE00000
-#else
-#define CONFIG_SYS_FMAN_FW_ADDR		0xEFF00000
-#define CONFIG_SYS_QE_FW_ADDR		0xEFE00000
-#endif
-#define CONFIG_SYS_QE_FMAN_FW_LENGTH	0x10000
 #define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 

+ 1 - 28
include/configs/T104xRDB.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2014 Freescale Semiconductor, Inc.
- * Copyright 2020 NXP
+ * Copyright 2020-2021 NXP
  */
 
 #ifndef __CONFIG_H
@@ -501,33 +501,6 @@
 
 #define CONFIG_U_QE
 
-/* Default address of microcode for the Linux Fman driver */
-#if defined(CONFIG_SPIFLASH)
-/*
- * env is stored at 0x100000, sector size is 0x10000, ucode is stored after
- * env, so we got 0x110000.
- */
-#define CONFIG_SYS_FMAN_FW_ADDR	0x110000
-#elif defined(CONFIG_SDCARD)
-/*
- * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is
- * about 1MB (2048 blocks), Env is stored after the image, and the env size is
- * 0x2000 (16 blocks), 8 + 2048 + 16 = 2072, enlarge it to 2080.
- */
-#define CONFIG_SYS_FMAN_FW_ADDR	(512 * 0x820)
-#else
-#define CONFIG_SYS_FMAN_FW_ADDR		0xEFF00000
-#endif
-
-#if defined(CONFIG_SPIFLASH)
-#define CONFIG_SYS_QE_FW_ADDR		0x130000
-#elif defined(CONFIG_SDCARD)
-#define CONFIG_SYS_QE_FW_ADDR		(512 * 0x920)
-#else
-#define CONFIG_SYS_QE_FW_ADDR		0xEFF10000
-#endif
-
-#define CONFIG_SYS_QE_FMAN_FW_LENGTH	0x10000
 #define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 

Some files were not shown because too many files changed in this diff