RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

brcm2708: switch to linux-firmware SDIO NVRAM 

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2019-07-13 13:30:57 +02:00
parent aa00ac44d9
commit 9e8932c17f
2 changed files with 23 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
package/firmware/brcmfmac-board-rpi/Makefile
View File

@ -8,25 +8,8 @@ PKG_FLAGS:=nonshared
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
BRCMFMAC434XX_SDIO_URL:=@GITHUB/RPi-Distro/firmware-nonfree/$(PKG_RELEASE)/brcm/ BRCMFMAC434XX_SDIO_URL:=@GITHUB/RPi-Distro/firmware-nonfree/$(PKG_RELEASE)/brcm/
BRCMFMAC43430_SDIO_FILE:=brcmfmac43430-sdio-$(PKG_RELEASE)
BRCMFMAC43455_SDIO_FILE:=brcmfmac43455-sdio-$(PKG_RELEASE) BRCMFMAC43455_SDIO_FILE:=brcmfmac43455-sdio-$(PKG_RELEASE)
define Download/brcmfmac43430_sdio_txt
FILE:=$(BRCMFMAC43430_SDIO_FILE).txt
URL:=$(BRCMFMAC434XX_SDIO_URL)
URL_FILE:=brcmfmac43430-sdio.txt
HASH:=e4ce7ad5ce72406f958ed758539b65d958d1c0eb3e46e3f8e9f02b510d88e0b0
endef
$(eval $(call Download,brcmfmac43430_sdio_txt))
define Download/brcmfmac43455_sdio_txt
FILE:=$(BRCMFMAC43455_SDIO_FILE).txt
URL:=$(BRCMFMAC434XX_SDIO_URL)
URL_FILE:=brcmfmac43455-sdio.txt
HASH:=15698c62457bcf25e60d063e6c666d6e1b7dacdf2b03e6d14ebbc619de6da6b7
endef
$(eval $(call Download,brcmfmac43455_sdio_txt))
define Download/brcmfmac43455_sdio_clm_blob define Download/brcmfmac43455_sdio_clm_blob
FILE:=$(BRCMFMAC43455_SDIO_FILE).clm_blob FILE:=$(BRCMFMAC43455_SDIO_FILE).clm_blob
URL:=$(BRCMFMAC434XX_SDIO_URL) URL:=$(BRCMFMAC434XX_SDIO_URL)
@ -43,29 +26,18 @@ define Package/brcmfmac-board-rpi/Default
PKGARCH:=all PKGARCH:=all
endef endef
define Package/brcmfmac-board-rpi2 define Package/brcmfmac-firmware-43455-clm_blob
$(call Package/brcmfmac-board-rpi/Default) $(call Package/brcmfmac-board-rpi/Default)
TITLE:=BCM43430 RPi SDIO NVRAM TITLE:=BCM43455 RPi SDIO Localisation Blob
endef endef
define Package/brcmfmac-board-rpi2/description define Package/brcmfmac-firmware-43455-clm_blob/description
NVRAM for the Broadcom BCM43430 on RPi boards. Localisation blob for the Broadcom BCM43455 on RPi boards.
endef
define Package/brcmfmac-board-rpi3
$(call Package/brcmfmac-board-rpi/Default)
TITLE:=BCM43455 RPi SDIO NVRAM
endef
define Package/brcmfmac-board-rpi3/description
NVRAM and localisations blob for the Broadcom BCM43455 on RPi boards.
endef endef
define Build/Prepare define Build/Prepare
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
mkdir -p $(PKG_BUILD_DIR) mkdir -p $(PKG_BUILD_DIR)
cp $(DL_DIR)/$(BRCMFMAC43430_SDIO_FILE).txt $(PKG_BUILD_DIR)/brcmfmac43430-sdio.txt
cp $(DL_DIR)/$(BRCMFMAC43455_SDIO_FILE).txt $(PKG_BUILD_DIR)/brcmfmac43455-sdio.txt
cp $(DL_DIR)/$(BRCMFMAC43455_SDIO_FILE).clm_blob $(PKG_BUILD_DIR)/brcmfmac43455-sdio.clm_blob cp $(DL_DIR)/$(BRCMFMAC43455_SDIO_FILE).clm_blob $(PKG_BUILD_DIR)/brcmfmac43455-sdio.clm_blob
endef endef
@ -73,16 +45,9 @@ define Build/Compile
true true
endef endef
define Package/brcmfmac-board-rpi2/install define Package/brcmfmac-firmware-43455-clm_blob/install
$(INSTALL_DIR) $(1)/lib/firmware/brcm/ $(INSTALL_DIR) $(1)/lib/firmware/brcm/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43430-sdio.txt $(1)/lib/firmware/brcm/
endef
define Package/brcmfmac-board-rpi3/install
$(INSTALL_DIR) $(1)/lib/firmware/brcm/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43455-sdio.txt $(1)/lib/firmware/brcm/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43455-sdio.clm_blob $(1)/lib/firmware/brcm/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43455-sdio.clm_blob $(1)/lib/firmware/brcm/
endef endef
$(eval $(call BuildPackage,brcmfmac-board-rpi2)) $(eval $(call BuildPackage,brcmfmac-firmware-43455-clm_blob))
$(eval $(call BuildPackage,brcmfmac-board-rpi3))

21
target/linux/brcm2708/image/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2012-2015 OpenWrt.org # Copyright (C) 2012-2019 OpenWrt.org
# Copyright (C) 2016-2017 LEDE project # Copyright (C) 2016-2017 LEDE project
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -64,7 +64,10 @@ define Device/rpi
raspberrypi,model-b raspberrypi,model-b-plus raspberrypi,model-b-rev2 \ raspberrypi,model-b raspberrypi,model-b-plus raspberrypi,model-b-rev2 \
raspberrypi,compute-module raspberrypi,compute-module-1 \ raspberrypi,compute-module raspberrypi,compute-module-1 \
raspberrypi,model-zero raspberrypi,model-zero-w raspberrypi,model-zero raspberrypi,model-zero-w
DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-board-rpi2 kmod-brcmfmac wpad-basic DEVICE_PACKAGES := \
brcmfmac-firmware-43430-sdio \
brcmfmac-firmware-43430-sdio-rpi-zero-w \
kmod-brcmfmac wpad-basic
endef endef
ifeq ($(SUBTARGET),bcm2708) ifeq ($(SUBTARGET),bcm2708)
TARGET_DEVICES += rpi TARGET_DEVICES += rpi
@ -78,7 +81,12 @@ define Device/rpi-2
raspberrypi,2-model-b \ raspberrypi,2-model-b \
raspberrypi,3-model-b raspberrypi,3-model-b-plus \ raspberrypi,3-model-b raspberrypi,3-model-b-plus \
raspberrypi,3-compute-module raspberrypi,compute-module-3 raspberrypi,3-compute-module raspberrypi,compute-module-3
DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-firmware-43455-sdio brcmfmac-board-rpi2 brcmfmac-board-rpi3 kmod-brcmfmac wpad-basic DEVICE_PACKAGES := \
brcmfmac-firmware-43430-sdio \
brcmfmac-firmware-43430-sdio-rpi-3b \
brcmfmac-firmware-43455-sdio brcmfmac-firmware-43455-clm_blob \
brcmfmac-firmware-43455-sdio-rpi-3b-plus \
kmod-brcmfmac wpad-basic
endef endef
ifeq ($(SUBTARGET),bcm2709) ifeq ($(SUBTARGET),bcm2709)
TARGET_DEVICES += rpi-2 TARGET_DEVICES += rpi-2
@ -92,7 +100,12 @@ define Device/rpi-3
rpi-3-b rpi-3-b-plus \ rpi-3-b rpi-3-b-plus \
raspberrypi,3-model-b raspberrypi,3-model-b-plus \ raspberrypi,3-model-b raspberrypi,3-model-b-plus \
raspberrypi,3-compute-module raspberrypi,compute-module-3 raspberrypi,3-compute-module raspberrypi,compute-module-3
DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-board-rpi2 brcmfmac-firmware-43455-sdio brcmfmac-board-rpi3 kmod-brcmfmac wpad-basic DEVICE_PACKAGES := \
brcmfmac-firmware-43430-sdio \
brcmfmac-firmware-43430-sdio-rpi-3b \
brcmfmac-firmware-43455-sdio brcmfmac-firmware-43455-clm_blob \
brcmfmac-firmware-43455-sdio-rpi-3b-plus \
kmod-brcmfmac wpad-basic
endef endef
ifeq ($(SUBTARGET),bcm2710) ifeq ($(SUBTARGET),bcm2710)
TARGET_DEVICES += rpi-3 TARGET_DEVICES += rpi-3