configs: Move SYS_DPAA_QBMAN to Kconfig

The CONFIG_SYS_DPAA_QBMAN define is used by DPAA1 freescale SOCs to
add device tree fixups that allow deep sleep in Linux. The define was
placed in header files included by a number of boards, but was not
explicitly documented in any of the Kconfigs. A description was added
to the drivers/networking menuconfig and default selection for
current SOCs that have this part

Signed-off-by: Ahmed Mansour <ahmed.mansour@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/configs/T1024QDS_DDR4_defconfig b/configs/T1024QDS_DDR4_defconfig
index b8e083cb258e4488ac5f1a3cadaf4070f6691cc9..4a09a5ce5741d02ac7fb3c70579674ef384ec1e0 100644 (file)
--- a/configs/T1024QDS_DDR4_defconfig
+++ b/configs/T1024QDS_DDR4_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
+CONFIG_NETDEVICES=y
 CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d42d915f17f4128752e6a1d94c78968bcccebed3..1986c7c46bef5cf0b906b1fd9e640dc0f8c970ec 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -373,4 +373,28 @@ config FEC2_PHY_NORXERR
          The PHY does not have a RXERR line (RMII only).
          (so program the FEC to ignore it).
 
+config SYS_DPAA_QBMAN
+       bool "Device tree fixup for QBMan on freescale SOCs"
+       depends on (ARM || PPC) && !SPL_BUILD
+       default y if ARCH_B4860 || \
+                    ARCH_B4420 || \
+                    ARCH_P1023 || \
+                    ARCH_P2041 || \
+                    ARCH_T1023 || \
+                    ARCH_T1024 || \
+                    ARCH_T1040 || \
+                    ARCH_T1042 || \
+                    ARCH_T2080 || \
+                    ARCH_T2081 || \
+                    ARCH_T4240 || \
+                    ARCH_T4160 || \
+                    ARCH_P4080 || \
+                    ARCH_P3041 || \
+                    ARCH_P5040 || \
+                    ARCH_P5020 || \
+                    ARCH_LS1043A || \
+                    ARCH_LS1046A
+       help
+         QBman fixups to allow deep sleep in DPAA 1 SOCs
+
 endif # NETDEVICES

diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index b1b672547b3d68d7af183cfffea8dd33ef6a9a95..25e6c1f6adc22aa7a086b6973c2c15e8053a785c 100644 (file)
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -571,7 +571,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    25
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #ifdef CONFIG_PHYS_64BIT

diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index 17ae6cfd40b2094baac15c08e587a0bf133145ff..1863bec33c763e762d753515df2efb3c051f9592 100644 (file)
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -270,7 +270,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_LOADADDR                1000000
 
 /* Qman/Bman */
-#define CONFIG_SYS_DPAA_QBMAN          /* support Q/Bman */
 #define CONFIG_SYS_QMAN_MEM_BASE       0xff000000
 #define CONFIG_SYS_QMAN_MEM_PHYS       CONFIG_SYS_QMAN_MEM_BASE
 #define CONFIG_SYS_QMAN_MEM_SIZE       0x00200000

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 8e71fdfecd0e779bcce6598b59a0cc8f8b8c0417..6b9f366502edbfcc70c863890d540f258829d147 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -437,7 +437,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_PCIE3_IO_SIZE       0x00010000      /* 64k */
 
 /* Qman/Bman */
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    10
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #ifdef CONFIG_PHYS_64BIT

diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index dd3cd6ecc6f3c4d0a94928bc6cc8a3799906fbee..2354dc8527537c5fc51465dc281ed6d85e626b1a 100644 (file)
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -641,7 +641,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    10
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #ifdef CONFIG_PHYS_64BIT

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 791c6ef1b3ff9a3b41a62bb131e896f9acffcb20..733e44f75c7b59e76267bdfeb3b987b4db7d9a66 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -648,7 +648,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    10
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #ifdef CONFIG_PHYS_64BIT

diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index fb79b6a559988d9d5b4e4b326a9d770a4f1d21c4..e96d3a0d92331823dc4523f545847f0dab15e4db 100644 (file)
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -531,7 +531,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    10
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index ceb9daaac2ea9bffbb7db09035388795aaca2b9e..1231c1a6a571ab0654bdaa4b23d7ee591615e78f 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -641,7 +641,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    10
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 43fcc6f5ddc4499847cb429c3445e72c732e47b4..bdff61af1b37bb3aae8af1b1cd58d6ed5db72d82 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -584,7 +584,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    18
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index e1c57de2af790a7613acac146782e4795a441b97..85bda94b57d6dafc68dbc0b022de3b8217803d0e 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -522,7 +522,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    18
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull

diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index 099e9e1d94ce838278f76e68acebefb9cc68e5ce..73e91bc9fa54eebe0b1d7d7adc87ec1c40bf6a6c 100644 (file)
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -381,7 +381,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    50
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index ecf7f6465972c1b50b13073e34f0ae5649698355..b63c38c8b5eb85a1d04aac0c21fe9f124569b177 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -542,7 +542,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    50
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index de9bc532fe53c0bc3e5c2d764a578fcadcf5d3a8..0e9dae63c7c03c74a0e899b86df52102061c4626 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -453,7 +453,6 @@
 #define CONFIG_SYS_PCIE4_IO_SIZE       0x00010000      /* 64k */
 
 /* Qman/Bman */
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    10
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #ifdef CONFIG_PHYS_64BIT

diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 942fbe2849d3caf0703f925b9cb2b868e98b992f..e413b5158c646c91926ea3d7a52684ab7356fc0a 100644 (file)
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -316,7 +316,6 @@
 #define CONFIG_SYS_PCIE4_IO_SIZE       0x00010000      /* 64k */
 
 /* Qman/Bman */
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    10
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #ifdef CONFIG_PHYS_64BIT

diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 6aa2b9d3cc51ba5658c13f3844a9fa785b76e562..a0c932a2fa156b495aa4390fb5b11d8768639f57 100644 (file)
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -296,7 +296,6 @@ int get_scl(void);
 #define CONFIG_SYS_PCIE3_IO_SIZE       0x00010000      /* 64k */
 
 /* Qman/Bman */
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS    10
 #define CONFIG_SYS_BMAN_MEM_BASE       0xf4000000
 #define CONFIG_SYS_BMAN_MEM_PHYS       0xff4000000ull

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 1a7ff56b8678b59d0e99191497f0075142b85076..67b5ea715e860f8508a69f8b3a42b8c50a9dbb12 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -194,8 +194,6 @@
 #endif
 #endif
 
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
-
 /* FMan ucode */
 #ifndef SPL_NO_FMAN
 #define CONFIG_SYS_DPAA_FMAN

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index e208f7d2de78a7d450255523f75f28602dbd3494..5c2ad696b6276d229cdfa95ef1efe26b08f1fb40 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -155,10 +155,6 @@
 #endif
 #endif
 
-#ifndef SPL_NO_QBMAN
-#define CONFIG_SYS_DPAA_QBMAN          /* Support Q/Bman */
-#endif
-
 /* FMan ucode */
 #ifndef SPL_NO_FMAN
 #define CONFIG_SYS_DPAA_FMAN