From be3fcd72e98844eb12b8dd9ae6c21f4d9c21ac3b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 14 Nov 2021 23:52:16 +0100 Subject: [PATCH] kernel: Deactivate B53 symbols in generic configuration Deactivate all the symbols of the B53 DSA driver in the generic kernel configuration. Multiple targets are now using this drivers and they only need some of the options. This fixes the bcm4908 build which didn't deactivate all of the options. Signed-off-by: Hauke Mehrtens --- target/linux/bcm4908/config-5.10 | 4 ---- target/linux/bcm4908/config-5.4 | 4 ---- target/linux/bcm53xx/config-5.10 | 3 --- target/linux/bmips/config-5.10 | 2 -- target/linux/generic/config-5.10 | 5 +++++ target/linux/generic/config-5.4 | 5 +++++ target/linux/sunxi/cortexa7/config-5.10 | 4 ---- target/linux/sunxi/cortexa7/config-5.4 | 4 ---- 8 files changed, 10 insertions(+), 21 deletions(-) diff --git a/target/linux/bcm4908/config-5.10 b/target/linux/bcm4908/config-5.10 index 9f11331d283..9dcff4270fe 100644 --- a/target/linux/bcm4908/config-5.10 +++ b/target/linux/bcm4908/config-5.10 @@ -31,10 +31,6 @@ CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_PSCI_FW=y CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y CONFIG_B53=y -# CONFIG_B53_MDIO_DRIVER is not set -# CONFIG_B53_MMAP_DRIVER is not set -# CONFIG_B53_SERDES is not set -# CONFIG_B53_SRAB_DRIVER is not set CONFIG_BCM4908_ENET=y CONFIG_BCM7038_WDT=y CONFIG_BCM7XXX_PHY=y diff --git a/target/linux/bcm4908/config-5.4 b/target/linux/bcm4908/config-5.4 index dc332032954..37706f61d3f 100644 --- a/target/linux/bcm4908/config-5.4 +++ b/target/linux/bcm4908/config-5.4 @@ -33,10 +33,6 @@ CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_PSCI_FW=y CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y CONFIG_B53=y -# CONFIG_B53_MDIO_DRIVER is not set -# CONFIG_B53_MMAP_DRIVER is not set -# CONFIG_B53_SERDES is not set -# CONFIG_B53_SRAB_DRIVER is not set CONFIG_BCM4908_ENET=y CONFIG_BCM7038_WDT=y CONFIG_BCM7XXX_PHY=y diff --git a/target/linux/bcm53xx/config-5.10 b/target/linux/bcm53xx/config-5.10 index ea5a7b0dc76..57cc051b191 100644 --- a/target/linux/bcm53xx/config-5.10 +++ b/target/linux/bcm53xx/config-5.10 @@ -41,9 +41,6 @@ CONFIG_ATAGS=y CONFIG_AUTO_ZRELADDR=y CONFIG_B53=y CONFIG_B53_MDIO_DRIVER=y -# CONFIG_B53_MMAP_DRIVER is not set -# CONFIG_B53_SERDES is not set -# CONFIG_B53_SPI_DRIVER is not set CONFIG_B53_SRAB_DRIVER=y CONFIG_BCM47XX_NVRAM=y CONFIG_BCM47XX_SPROM=y diff --git a/target/linux/bmips/config-5.10 b/target/linux/bmips/config-5.10 index 7a50227d2a4..69a2ef74d95 100644 --- a/target/linux/bmips/config-5.10 +++ b/target/linux/bmips/config-5.10 @@ -6,9 +6,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_B53=y CONFIG_B53_MDIO_DRIVER=y CONFIG_B53_MMAP_DRIVER=y -# CONFIG_B53_SERDES is not set CONFIG_B53_SPI_DRIVER=y -# CONFIG_B53_SRAB_DRIVER is not set CONFIG_BCM6345_EXT_IRQ=y CONFIG_BCM6345_L1_IRQ=y CONFIG_BCM6368_ENETSW=y diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index fe54ba1a52e..a803ba36d74 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -498,6 +498,11 @@ CONFIG_ATM_CLIP_NO_ICMP=y # CONFIG_B43LEGACY is not set # CONFIG_B44 is not set # CONFIG_B53 is not set +# CONFIG_B53_MDIO_DRIVER is not set +# CONFIG_B53_MMAP_DRIVER is not set +# CONFIG_B53_SERDES is not set +# CONFIG_B53_SPI_DRIVER is not set +# CONFIG_B53_SRAB_DRIVER is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set # CONFIG_BACKLIGHT_APPLE is not set diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index f2422376dbe..1f004a3eeb7 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -469,6 +469,11 @@ CONFIG_ATM_CLIP_NO_ICMP=y # CONFIG_B43LEGACY is not set # CONFIG_B44 is not set # CONFIG_B53 is not set +# CONFIG_B53_MDIO_DRIVER is not set +# CONFIG_B53_MMAP_DRIVER is not set +# CONFIG_B53_SERDES is not set +# CONFIG_B53_SPI_DRIVER is not set +# CONFIG_B53_SRAB_DRIVER is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set # CONFIG_BACKLIGHT_APPLE is not set diff --git a/target/linux/sunxi/cortexa7/config-5.10 b/target/linux/sunxi/cortexa7/config-5.10 index 898461b6789..e77f4d872fb 100644 --- a/target/linux/sunxi/cortexa7/config-5.10 +++ b/target/linux/sunxi/cortexa7/config-5.10 @@ -1,9 +1,5 @@ CONFIG_B53=y CONFIG_B53_MDIO_DRIVER=y -# CONFIG_B53_MMAP_DRIVER is not set -# CONFIG_B53_SERDES is not set -# CONFIG_B53_SPI_DRIVER is not set -# CONFIG_B53_SRAB_DRIVER is not set CONFIG_DWMAC_SUN8I=y CONFIG_GRO_CELLS=y # CONFIG_MACH_SUN4I is not set diff --git a/target/linux/sunxi/cortexa7/config-5.4 b/target/linux/sunxi/cortexa7/config-5.4 index 1136c842725..9f76cacabe5 100644 --- a/target/linux/sunxi/cortexa7/config-5.4 +++ b/target/linux/sunxi/cortexa7/config-5.4 @@ -29,7 +29,3 @@ CONFIG_NET_DSA_TAG_BRCM_PREPEND=y CONFIG_NET_SWITCHDEV=y CONFIG_B53=y CONFIG_B53_MDIO_DRIVER=y -# CONFIG_B53_MMAP_DRIVER is not set -# CONFIG_B53_SERDES is not set -# CONFIG_B53_SPI_DRIVER is not set -# CONFIG_B53_SRAB_DRIVER is not set