bmips: switch to generic bcma/ssb fallback SPROM

Stop using bmips b43-sprom fixups and switch to generic bcma/ssb fallback
SPROMs. This way we don't need to include the b43-sprom fixups on devices
without Broadcom wireless.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

diff --git a/target/linux/bmips/bcm6318/config-5.15 b/target/linux/bmips/bcm6318/config-5.15
index 588d7517447dd67435a000ce603a7727f5b9bb85..50401a58e8dbc4d63255737dcfdbf465da3128b1 100644 (file)
--- a/target/linux/bmips/bcm6318/config-5.15
+++ b/target/linux/bmips/bcm6318/config-5.15
@@ -14,16 +14,6 @@ CONFIG_BCM6345_L1_IRQ=y
 CONFIG_BCM6368_ENETSW=y
 CONFIG_BCM63XX_POWER=y
 CONFIG_BCM7038_WDT=y
-CONFIG_BCMA=y
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-# CONFIG_BCMA_DRIVER_MIPS is not set
-CONFIG_BCMA_DRIVER_PCI=y
-# CONFIG_BCMA_DRIVER_PCI_HOSTMODE is not set
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-# CONFIG_BCMA_HOST_SOC is not set
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_PM=y
 CONFIG_BMIPS_GENERIC=y

diff --git a/target/linux/bmips/bcm63268/config-5.15 b/target/linux/bmips/bcm63268/config-5.15
index 4cdbe132281b4763b95c21488743d036a62d4de4..09754e9f8be4084aae87fdf70608b3b257b7f5c8 100644 (file)
--- a/target/linux/bmips/bcm63268/config-5.15
+++ b/target/linux/bmips/bcm63268/config-5.15
@@ -14,16 +14,6 @@ CONFIG_BCM6345_L1_IRQ=y
 CONFIG_BCM6368_ENETSW=y
 CONFIG_BCM63XX_POWER=y
 CONFIG_BCM7038_WDT=y
-CONFIG_BCMA=y
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-# CONFIG_BCMA_DRIVER_MIPS is not set
-CONFIG_BCMA_DRIVER_PCI=y
-# CONFIG_BCMA_DRIVER_PCI_HOSTMODE is not set
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-# CONFIG_BCMA_HOST_SOC is not set
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_PM=y
 CONFIG_BMIPS_GENERIC=y

diff --git a/target/linux/bmips/bcm6328/config-5.15 b/target/linux/bmips/bcm6328/config-5.15
index ea9898782acc0e027d014e979a43d19989c78744..1e7712ead69d7380e19dc9aff6220cc763486c72 100644 (file)
--- a/target/linux/bmips/bcm6328/config-5.15
+++ b/target/linux/bmips/bcm6328/config-5.15
@@ -14,16 +14,6 @@ CONFIG_BCM6345_L1_IRQ=y
 CONFIG_BCM6368_ENETSW=y
 CONFIG_BCM63XX_POWER=y
 CONFIG_BCM7038_WDT=y
-CONFIG_BCMA=y
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-# CONFIG_BCMA_DRIVER_MIPS is not set
-CONFIG_BCMA_DRIVER_PCI=y
-# CONFIG_BCMA_DRIVER_PCI_HOSTMODE is not set
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-# CONFIG_BCMA_HOST_SOC is not set
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_PM=y
 CONFIG_BMIPS_GENERIC=y

diff --git a/target/linux/bmips/bcm6358/config-5.15 b/target/linux/bmips/bcm6358/config-5.15
index 62956398d54e4d7a78d5ad3a02c288660f424ecc..5d7a299444388ac1e8d22fa5fb18c0e75bc02862 100644 (file)
--- a/target/linux/bmips/bcm6358/config-5.15
+++ b/target/linux/bmips/bcm6358/config-5.15
@@ -230,15 +230,6 @@ CONFIG_SPI_BCM63XX=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
 CONFIG_SRCU=y
-CONFIG_SSB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_BLOCKIO=y
-# CONFIG_SSB_DRIVER_MIPS is not set
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_SPROM=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_SWPHY=y
 CONFIG_SYNC_R4K=y

diff --git a/target/linux/bmips/bcm6362/config-5.15 b/target/linux/bmips/bcm6362/config-5.15
index 325692e5f35027e5d481bf764d57737a500052a7..5f9b528d957f24e40a8688797531a3e1a7fac675 100644 (file)
--- a/target/linux/bmips/bcm6362/config-5.15
+++ b/target/linux/bmips/bcm6362/config-5.15
@@ -14,16 +14,6 @@ CONFIG_BCM6345_L1_IRQ=y
 CONFIG_BCM6368_ENETSW=y
 CONFIG_BCM63XX_POWER=y
 CONFIG_BCM7038_WDT=y
-CONFIG_BCMA=y
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-# CONFIG_BCMA_DRIVER_MIPS is not set
-CONFIG_BCMA_DRIVER_PCI=y
-# CONFIG_BCMA_DRIVER_PCI_HOSTMODE is not set
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-# CONFIG_BCMA_HOST_SOC is not set
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_PM=y
 CONFIG_BMIPS_GENERIC=y

diff --git a/target/linux/bmips/bcm6368/config-5.15 b/target/linux/bmips/bcm6368/config-5.15
index 06d72d9ebe65c59a66548fc16f1b36730c258661..910d36ce0b3e9261340f25e7f10c6c9fbdf2a687 100644 (file)
--- a/target/linux/bmips/bcm6368/config-5.15
+++ b/target/linux/bmips/bcm6368/config-5.15
@@ -245,15 +245,6 @@ CONFIG_SPI_BCM63XX=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
 CONFIG_SRCU=y
-CONFIG_SSB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_BLOCKIO=y
-# CONFIG_SSB_DRIVER_MIPS is not set
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_SPROM=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_SWPHY=y
 CONFIG_SYNC_R4K=y

diff --git a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
index 9226922a7ae59076ebaf1fb75d92a3b9b567ef2d..7f2d438efbf56d824b3aab3761afea5328b8d8fb 100644 (file)
--- a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
+++ b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
@@ -37,7 +37,7 @@
        };
 
        bcm43217-sprom {
-               compatible = "brcm,bcm43217-sprom";
+               compatible = "brcm,bcma-sprom";
 
                pci-bus = <1>;
                pci-dev = <0>;
@@ -46,6 +46,7 @@
                nvmem-cell-names = "mac-address";
                mac-address-increment = <1>;
 
+               brcm,sprom = "brcm/bcm43217-sprom.bin";
                brcm,sprom-fixups = <6 0x1c00>,
                                    <65 0x1255>,
                                    <97 0xfe55>,

diff --git a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
index df6ee5eadd6a0703a62f1102fd92637736c12e1a..276858dff72df65efc798d2f40a7ca26c51eb12f 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
+++ b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
@@ -29,7 +29,7 @@
        };
 
        bcm43225-sprom {
-               compatible = "brcm,bcm43225-sprom";
+               compatible = "brcm,bcma-sprom";
 
                pci-bus = <1>;
                pci-dev = <0>;
@@ -38,6 +38,7 @@
                nvmem-cell-names = "mac-address";
                mac-address-increment = <1>;
 
+               brcm,sprom = "brcm/bcm43225-sprom.bin";
                brcm,sprom-fixups = <2 0x05bb>,
                                    <65 0x1204>,
                                    <78 0x0303>,

diff --git a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
index 5f0565fa4c26c79c1509d0cd301f7ce8d2822c60..b29078d645df1c94569e932c57490543dea2fc77 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
+++ b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
@@ -58,7 +58,7 @@
        };
 
        bcm43222-sprom {
-               compatible = "brcm,bcm43222-sprom";
+               compatible = "brcm,ssb-sprom";
 
                pci-bus = <0>;
                pci-dev = <1>;
@@ -67,6 +67,7 @@
                nvmem-cell-names = "mac-address";
                mac-address-increment = <1>;
 
+               brcm,sprom = "brcm/bcm43222-sprom.bin";
                brcm,sprom-fixups = <97 0xfeb3>,
                                    <98 0x1618>,
                                    <99 0xfab0>,

diff --git a/target/linux/bmips/image/bcm6318.mk b/target/linux/bmips/image/bcm6318.mk
index fc73eb452198b43425e149cb2cc339a5ed066f37..bfd75cc077329ccf9f934e147eea9d2796526001 100644 (file)
--- a/target/linux/bmips/image/bcm6318.mk
+++ b/target/linux/bmips/image/bcm6318.mk
@@ -7,7 +7,8 @@ define Device/comtrend_ar-5315u
   CHIP_ID := 6318
   CFE_BOARD_ID := 96318A-1441N1
   FLASH_MB := 16
-  DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) \
+  DEVICE_PACKAGES += $(USB2_PACKAGES) \
+    $(B43_PACKAGES) broadcom-43217-sprom \
     kmod-leds-bcm6328
 endef
 TARGET_DEVICES += comtrend_ar-5315u

diff --git a/target/linux/bmips/image/bcm6328.mk b/target/linux/bmips/image/bcm6328.mk
index 3a739a7e712fe6aa26fe4c8dd4a083a53efb41a6..b3cef51a71be57fba5a97c2583211339f9fc58ae 100644 (file)
--- a/target/linux/bmips/image/bcm6328.mk
+++ b/target/linux/bmips/image/bcm6328.mk
@@ -7,7 +7,8 @@ define Device/comtrend_ar-5387un
   CHIP_ID := 6328
   CFE_BOARD_ID := 96328A-1441N1
   FLASH_MB := 16
-  DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) \
+  DEVICE_PACKAGES += $(USB2_PACKAGES) \
+    $(B43_PACKAGES) broadcom-43225-sprom \
     kmod-leds-bcm6328
 endef
 TARGET_DEVICES += comtrend_ar-5387un

diff --git a/target/linux/bmips/image/bcm6368.mk b/target/linux/bmips/image/bcm6368.mk
index be4cc576db182ce272c86cf96e73953e185ad46b..268b68dd7c305b36cb881859245fb1326d3885c5 100644 (file)
--- a/target/linux/bmips/image/bcm6368.mk
+++ b/target/linux/bmips/image/bcm6368.mk
@@ -8,7 +8,8 @@ define Device/comtrend_vr-3025u
   CFE_BOARD_ID := 96368M-1541N
   BLOCKSIZE := 0x20000
   FLASH_MB := 32
-  DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) \
+  DEVICE_PACKAGES += $(USB2_PACKAGES) \
+    $(B43_PACKAGES) broadcom-43222-sprom \
     kmod-leds-gpio
 endef
 TARGET_DEVICES += comtrend_vr-3025u