From: Tony Ambardar Date: Wed, 30 Nov 2022 01:52:46 +0000 (-0800) Subject: kernel: fix handling of CONFIG_DYNAMIC_DEBUG X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3980dfcd05741bd650d0e3d0938bfd071ffa7824;p=openwrt%2Fstaging%2Fjogo.git 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 --- diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index 49325971f6..9c4aad86c1 100644 --- 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 c6af24ec66..132f65c806 100644 --- 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 32260fa08c..88029caf76 100644 --- 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 826dd73455..1f1af06b29 100644 --- 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 0bd6dde11c..6d710e61f5 100644 --- 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 883e194be4..41f127ea5b 100644 --- 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 9fb6f7befd..1ce6d852ba 100644 --- 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 bf487462d5..8ebee2bb14 100644 --- 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 17c4d910c8..9771ee8b4c 100644 --- 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