kernel: fix handling of CONFIG_DYNAMIC_DEBUG

Since CONFIG_DYNAMIC_DEBUG is already managed via the KERNEL_DYNAMIC_DEBUG
setting in Config-kernel.in (default N), remove or disable it in target
configs which unconditionally enable it, along with the related setting
CONFIG_DYNAMIC_DEBUG_CORE. This saves several KB in the kernels for
ipq40xx, ipq806x, filogic, mt7622, qoriq, and sunxi.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>

diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index 49325971f611bc7462d38869cd32d56a2dfbb8c7..9c4aad86c1484055194ec39da8f755ecb368178a 100644 (file)
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -1746,7 +1746,7 @@ CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DW_EDMA_PCIE is not set
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_DYNAMIC_DEBUG is not set
-CONFIG_DYNAMIC_DEBUG_CORE=y
+# CONFIG_DYNAMIC_DEBUG_CORE is not set
 # CONFIG_E100 is not set
 # CONFIG_E1000 is not set
 # CONFIG_E1000E is not set

diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index c6af24ec661e809f35deaf597933f78364f8b848..132f65c80688b19e02d8ec1b84a020734b575f45 100644 (file)
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -1830,7 +1830,7 @@ CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_DW_XDATA_PCIE is not set
 # CONFIG_DYNAMIC_DEBUG is not set
-CONFIG_DYNAMIC_DEBUG_CORE=y
+# CONFIG_DYNAMIC_DEBUG_CORE is not set
 # CONFIG_E100 is not set
 # CONFIG_E1000 is not set
 # CONFIG_E1000E is not set

diff --git a/target/linux/ipq40xx/config-5.15 b/target/linux/ipq40xx/config-5.15
index 32260fa08c92f9ee4db6f493e3d494480040bf57..88029caf763af9d79ee9b6bf5fba0466fda461f5 100644 (file)
--- a/target/linux/ipq40xx/config-5.15
+++ b/target/linux/ipq40xx/config-5.15
@@ -144,7 +144,6 @@ CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DTC=y
 CONFIG_DT_IDLE_STATES=y
-CONFIG_DYNAMIC_DEBUG=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EEPROM_AT24=y

diff --git a/target/linux/ipq806x/config-5.10 b/target/linux/ipq806x/config-5.10
index 826dd73455188dd9c81e6c43793c72983b53b606..1f1af06b29d2ac44fb8a5e60fc970cc60bee9e54 100644 (file)
--- a/target/linux/ipq806x/config-5.10
+++ b/target/linux/ipq806x/config-5.10
@@ -135,7 +135,6 @@ CONFIG_DT_IDLE_STATES=y
 # CONFIG_DWMAC_GENERIC is not set
 CONFIG_DWMAC_IPQ806X=y
 # CONFIG_DWMAC_QCOM_ETHQOS is not set
-CONFIG_DYNAMIC_DEBUG=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_ETHERNET_PACKET_MANGLE=y

diff --git a/target/linux/ipq806x/config-5.15 b/target/linux/ipq806x/config-5.15
index 0bd6dde11cbc91d08ce00177ded2357f9fd2e8b4..6d710e61f56c7244bafa27aa189df5e14358e1c5 100644 (file)
--- a/target/linux/ipq806x/config-5.15
+++ b/target/linux/ipq806x/config-5.15
@@ -136,7 +136,6 @@ CONFIG_DT_IDLE_STATES=y
 # CONFIG_DWMAC_GENERIC is not set
 CONFIG_DWMAC_IPQ806X=y
 # CONFIG_DWMAC_QCOM_ETHQOS is not set
-CONFIG_DYNAMIC_DEBUG=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_ETHERNET_PACKET_MANGLE=y

diff --git a/target/linux/mediatek/filogic/config-5.15 b/target/linux/mediatek/filogic/config-5.15
index 883e194be439efbced76a4be79582b5885308366..41f127ea5b523d253888d7e2b6cb28f6c541f1ce 100644 (file)
--- a/target/linux/mediatek/filogic/config-5.15
+++ b/target/linux/mediatek/filogic/config-5.15
@@ -127,7 +127,6 @@ CONFIG_DMA_OF=y
 CONFIG_DMA_REMAP=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DTC=y
-CONFIG_DYNAMIC_DEBUG=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EINT_MTK=y
 CONFIG_EXT4_FS=y

diff --git a/target/linux/mediatek/mt7622/config-5.15 b/target/linux/mediatek/mt7622/config-5.15
index 9fb6f7befd6bfea40752623e6b7f66e30759fe18..1ce6d852ba1c1ad185b99f5c1bb1620898013df6 100644 (file)
--- a/target/linux/mediatek/mt7622/config-5.15
+++ b/target/linux/mediatek/mt7622/config-5.15
@@ -150,7 +150,6 @@ CONFIG_DMA_OF=y
 CONFIG_DMA_REMAP=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DTC=y
-CONFIG_DYNAMIC_DEBUG=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EINT_MTK=y
 CONFIG_EXT4_FS=y

diff --git a/target/linux/qoriq/config-5.15 b/target/linux/qoriq/config-5.15
index bf487462d5e6744a7632700fb81f86cb24a8e25a..8ebee2bb14f8bbb3933cb3f35c79898b68d2f1e7 100644 (file)
--- a/target/linux/qoriq/config-5.15
+++ b/target/linux/qoriq/config-5.15
@@ -93,7 +93,6 @@ CONFIG_DMA_OPS_BYPASS=y
 CONFIG_DPAA_ERRATUM_A050385=y
 CONFIG_DTC=y
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_DYNAMIC_DEBUG=y
 CONFIG_E500=y
 # CONFIG_E5500_CPU is not set
 CONFIG_E6500_CPU=y

diff --git a/target/linux/sunxi/config-5.15 b/target/linux/sunxi/config-5.15
index 17c4d910c8e9ea6f65828b399aed371d99efc878..9771ee8b4cf9c67cdcf904865d83ac46106d7887 100644 (file)
--- a/target/linux/sunxi/config-5.15
+++ b/target/linux/sunxi/config-5.15
@@ -136,7 +136,6 @@ CONFIG_DVB_CORE=y
 CONFIG_DWMAC_GENERIC=y
 # CONFIG_DWMAC_SUN8I is not set
 CONFIG_DWMAC_SUNXI=y
-CONFIG_DYNAMIC_DEBUG=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_ELF_CORE=y