ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-23 15:32:33 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

bmips: switch to generic bcma/ssb fallback SPROM

Browse Source 
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>
This commit is contained in:
Álvaro Fernández Rojas 2023-04-20 10:05:52 +02:00
parent e656bcbab0
commit 7122609082
12 changed files with 12 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/bmips/bcm6318/config-5.15
View File

@ -14,16 +14,6 @@ CONFIG_BCM6345_L1_IRQ=y
CONFIG_BCM6368_ENETSW=y CONFIG_BCM6368_ENETSW=y
CONFIG_BCM63XX_POWER=y CONFIG_BCM63XX_POWER=y
CONFIG_BCM7038_WDT=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_MQ_PCI=y
CONFIG_BLK_PM=y CONFIG_BLK_PM=y
CONFIG_BMIPS_GENERIC=y CONFIG_BMIPS_GENERIC=y

10
target/linux/bmips/bcm63268/config-5.15
View File

@ -14,16 +14,6 @@ CONFIG_BCM6345_L1_IRQ=y
CONFIG_BCM6368_ENETSW=y CONFIG_BCM6368_ENETSW=y
CONFIG_BCM63XX_POWER=y CONFIG_BCM63XX_POWER=y
CONFIG_BCM7038_WDT=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_MQ_PCI=y
CONFIG_BLK_PM=y CONFIG_BLK_PM=y
CONFIG_BMIPS_GENERIC=y CONFIG_BMIPS_GENERIC=y

10
target/linux/bmips/bcm6328/config-5.15
View File

@ -14,16 +14,6 @@ CONFIG_BCM6345_L1_IRQ=y
CONFIG_BCM6368_ENETSW=y CONFIG_BCM6368_ENETSW=y
CONFIG_BCM63XX_POWER=y CONFIG_BCM63XX_POWER=y
CONFIG_BCM7038_WDT=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_MQ_PCI=y
CONFIG_BLK_PM=y CONFIG_BLK_PM=y
CONFIG_BMIPS_GENERIC=y CONFIG_BMIPS_GENERIC=y

9
target/linux/bmips/bcm6358/config-5.15
View File

@ -230,15 +230,6 @@ CONFIG_SPI_BCM63XX=y
CONFIG_SPI_MASTER=y CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y CONFIG_SPI_MEM=y
CONFIG_SRCU=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_SWAP_IO_SPACE=y
CONFIG_SWPHY=y CONFIG_SWPHY=y
CONFIG_SYNC_R4K=y CONFIG_SYNC_R4K=y

10
target/linux/bmips/bcm6362/config-5.15
View File

@ -14,16 +14,6 @@ CONFIG_BCM6345_L1_IRQ=y
CONFIG_BCM6368_ENETSW=y CONFIG_BCM6368_ENETSW=y
CONFIG_BCM63XX_POWER=y CONFIG_BCM63XX_POWER=y
CONFIG_BCM7038_WDT=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_MQ_PCI=y
CONFIG_BLK_PM=y CONFIG_BLK_PM=y
CONFIG_BMIPS_GENERIC=y CONFIG_BMIPS_GENERIC=y

9
target/linux/bmips/bcm6368/config-5.15
View File

@ -245,15 +245,6 @@ CONFIG_SPI_BCM63XX=y
CONFIG_SPI_MASTER=y CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y CONFIG_SPI_MEM=y
CONFIG_SRCU=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_SWAP_IO_SPACE=y
CONFIG_SWPHY=y CONFIG_SWPHY=y
CONFIG_SYNC_R4K=y CONFIG_SYNC_R4K=y

3
target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
View File

@ -37,7 +37,7 @@
}; };
bcm43217-sprom { bcm43217-sprom {
compatible = "brcm,bcm43217-sprom"; compatible = "brcm,bcma-sprom";
pci-bus = <1>; pci-bus = <1>;
pci-dev = <0>; pci-dev = <0>;
@ -46,6 +46,7 @@
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>; mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43217-sprom.bin";
brcm,sprom-fixups = <6 0x1c00>, brcm,sprom-fixups = <6 0x1c00>,
<65 0x1255>, <65 0x1255>,
<97 0xfe55>, <97 0xfe55>,

3
target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
View File

@ -29,7 +29,7 @@
}; };
bcm43225-sprom { bcm43225-sprom {
compatible = "brcm,bcm43225-sprom"; compatible = "brcm,bcma-sprom";
pci-bus = <1>; pci-bus = <1>;
pci-dev = <0>; pci-dev = <0>;
@ -38,6 +38,7 @@
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>; mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43225-sprom.bin";
brcm,sprom-fixups = <2 0x05bb>, brcm,sprom-fixups = <2 0x05bb>,
<65 0x1204>, <65 0x1204>,
<78 0x0303>, <78 0x0303>,

3
target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
View File

@ -58,7 +58,7 @@
}; };
bcm43222-sprom { bcm43222-sprom {
compatible = "brcm,bcm43222-sprom"; compatible = "brcm,ssb-sprom";
pci-bus = <0>; pci-bus = <0>;
pci-dev = <1>; pci-dev = <1>;
@ -67,6 +67,7 @@
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>; mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43222-sprom.bin";
brcm,sprom-fixups = <97 0xfeb3>, brcm,sprom-fixups = <97 0xfeb3>,
<98 0x1618>, <98 0x1618>,
<99 0xfab0>, <99 0xfab0>,

3
target/linux/bmips/image/bcm6318.mk
View File

@ -7,7 +7,8 @@ define Device/comtrend_ar-5315u
CHIP_ID := 6318 CHIP_ID := 6318
CFE_BOARD_ID := 96318A-1441N1 CFE_BOARD_ID := 96318A-1441N1
FLASH_MB := 16 FLASH_MB := 16
DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) \ DEVICE_PACKAGES += $(USB2_PACKAGES) \
$(B43_PACKAGES) broadcom-43217-sprom \
kmod-leds-bcm6328 kmod-leds-bcm6328
endef endef
TARGET_DEVICES += comtrend_ar-5315u TARGET_DEVICES += comtrend_ar-5315u

3
target/linux/bmips/image/bcm6328.mk
View File

@ -7,7 +7,8 @@ define Device/comtrend_ar-5387un
CHIP_ID := 6328 CHIP_ID := 6328
CFE_BOARD_ID := 96328A-1441N1 CFE_BOARD_ID := 96328A-1441N1
FLASH_MB := 16 FLASH_MB := 16
DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) \ DEVICE_PACKAGES += $(USB2_PACKAGES) \
$(B43_PACKAGES) broadcom-43225-sprom \
kmod-leds-bcm6328 kmod-leds-bcm6328
endef endef
TARGET_DEVICES += comtrend_ar-5387un TARGET_DEVICES += comtrend_ar-5387un

3
target/linux/bmips/image/bcm6368.mk
View File

@ -8,7 +8,8 @@ define Device/comtrend_vr-3025u
CFE_BOARD_ID := 96368M-1541N CFE_BOARD_ID := 96368M-1541N
BLOCKSIZE := 0x20000 BLOCKSIZE := 0x20000
FLASH_MB := 32 FLASH_MB := 32
DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) \ DEVICE_PACKAGES += $(USB2_PACKAGES) \
$(B43_PACKAGES) broadcom-43222-sprom \
kmod-leds-gpio kmod-leds-gpio
endef endef
TARGET_DEVICES += comtrend_vr-3025u TARGET_DEVICES += comtrend_vr-3025u