diff --git a/package/firmware/cypress-nvram/Makefile b/package/firmware/cypress-nvram/Makefile index 7c999540ca7..dcf09d95998 100644 --- a/package/firmware/cypress-nvram/Makefile +++ b/package/firmware/cypress-nvram/Makefile @@ -1,135 +1,38 @@ -# -# Copyright (C) 2019 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# SPDX-License-Identifier: GPL-2.0-or-later include $(TOPDIR)/rules.mk PKG_NAME:=cypress-nvram -PKG_SOURCE_DATE:=2019-09-03 -PKG_SOURCE_VERSION:=e7b78df22f2a0c5f56abb7b5880661611de35e5f -PKG_MIRROR_HASH:=1cb20a749696852be0a512d51961365dd9c031362af0af1a2b9f5a3fb894885f -PKG_RELEASE:=4 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/openwrt/cypress-nvram.git +PKG_RELEASE:=7 PKG_MAINTAINER:=Álvaro Fernández Rojas -PKG_FLAGS:=nonshared - include $(INCLUDE_DIR)/package.mk define Package/cypress-nvram-default SECTION:=firmware CATEGORY:=Firmware - URL:=https://community.cypress.com/community/linux endef define Build/Compile true endef -# Cypress 43430 SDIO Raspberry Pi 3B NVRAM -define Package/cypress-nvram-43430-sdio-rpi-3b +# Cypress 4339 SDIO NVRAM +define Package/cypress-nvram-4339-sdio $(Package/cypress-nvram-default) - TITLE:=CYW43430 NVRAM for Raspberry Pi 3B - DEPENDS:=@TARGET_bcm27xx - CONFLICTS:=brcmfmac-firmware-43430-sdio-rpi-3b + TITLE:=BCM4339 SDIO NVRAM + CONFLICTS:=brcmfmac-nvram-4339-sdio endef -define Package/cypress-nvram-43430-sdio-rpi-3b/install +define Package/cypress-nvram-4339-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/brcmfmac43430-sdio.raspberrypi,3-model-b.txt \ + ./files/brcmfmac4339-sdio.AP6335.txt \ $(1)/lib/firmware/brcm/ -endef - -$(eval $(call BuildPackage,cypress-nvram-43430-sdio-rpi-3b)) - -# Cypress 43430 SDIO Raspberry Pi Zero W NVRAM -define Package/cypress-nvram-43430-sdio-rpi-zero-w - $(Package/cypress-nvram-default) - TITLE:=CYW43430 NVRAM for Raspberry Pi Zero W - DEPENDS:=@TARGET_bcm27xx +cypress-nvram-43430-sdio-rpi-3b - CONFLICTS:=brcmfmac-firmware-43430-sdio-rpi-zero-w -endef - -define Package/cypress-nvram-43430-sdio-rpi-zero-w/install - $(INSTALL_DIR) $(1)/lib/firmware/brcm $(LN) \ - brcmfmac43430-sdio.raspberrypi,3-model-b.txt \ - $(1)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt + brcmfmac4339-sdio.AP6335.txt \ + $(1)/lib/firmware/brcm/brcmfmac4339-sdio.technexion,imx7d-pico-pi.txt endef -$(eval $(call BuildPackage,cypress-nvram-43430-sdio-rpi-zero-w)) - -# Cypress 43455 SDIO Raspberry Pi 3B+ NVRAM -define Package/cypress-nvram-43455-sdio-rpi-3b-plus - $(Package/cypress-nvram-default) - TITLE:=CYW43455 NVRAM for Raspberry Pi 3B+ - DEPENDS:=@TARGET_bcm27xx - CONFLICTS:=brcmfmac-firmware-43455-sdio-rpi-3b-plus -endef - -define Package/cypress-nvram-43455-sdio-rpi-3b-plus/install - $(INSTALL_DIR) $(1)/lib/firmware/brcm - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \ - $(1)/lib/firmware/brcm/ -endef - -$(eval $(call BuildPackage,cypress-nvram-43455-sdio-rpi-3b-plus)) - -# Cypress 43455 SDIO Raspberry Pi 4B NVRAM -define Package/cypress-nvram-43455-sdio-rpi-4b - $(Package/cypress-nvram-default) - TITLE:=CYW43455 NVRAM for Raspberry Pi 4B - DEPENDS:=@TARGET_bcm27xx - CONFLICTS:=brcmfmac-firmware-43455-sdio-rpi-4b -endef - -define Package/cypress-nvram-43455-sdio-rpi-4b/install - $(INSTALL_DIR) $(1)/lib/firmware/brcm - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/brcmfmac43455-sdio.raspberrypi,4-model-b.txt \ - $(1)/lib/firmware/brcm/ -endef - -$(eval $(call BuildPackage,cypress-nvram-43455-sdio-rpi-4b)) - -# Cypress 43455 SDIO Raspberry Pi CM4 NVRAM -define Package/cypress-nvram-43455-sdio-rpi-cm4 - $(Package/cypress-nvram-default) - TITLE:=CYW43455 NVRAM for Raspberry Pi CM4 - DEPENDS:=@TARGET_bcm27xx +cypress-nvram-43455-sdio-rpi-4b - CONFLICTS:=brcmfmac-firmware-43455-sdio-rpi-cm4 -endef - -define Package/cypress-nvram-43455-sdio-rpi-cm4/install - $(INSTALL_DIR) $(1)/lib/firmware/brcm - $(LN) \ - brcmfmac43455-sdio.raspberrypi,4-model-b.txt \ - $(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt -endef - -$(eval $(call BuildPackage,cypress-nvram-43455-sdio-rpi-cm4)) - -# Cypress 4339 SDIO PICO-PI-IMX7D -define Package/cypress-nvram-4339-pico-pi-imx7d - $(Package/cypress-nvram-default) - TITLE:=BCM4339 NVRAM for TechNexion PICO-PI-IMX7D - DEPENDS:=@TARGET_imx_cortexa7 - CONFLICTS:=brcmfmac-firmware-4339-pico-pi-imx7d -endef - -define Package/cypress-nvram-4339-pico-pi-imx7d/install - $(INSTALL_DIR) $(1)/lib/firmware/brcm - $(INSTALL_DATA) \ - ./files/brcmfmac4339-sdio.technexion,imx7d-pico-pi.txt \ - $(1)/lib/firmware/brcm/ -endef - -$(eval $(call BuildPackage,cypress-nvram-4339-pico-pi-imx7d)) +$(eval $(call BuildPackage,cypress-nvram-4339-sdio)) diff --git a/package/firmware/cypress-nvram/files/brcmfmac4339-sdio.technexion,imx7d-pico-pi.txt b/package/firmware/cypress-nvram/files/brcmfmac4339-sdio.AP6335.txt similarity index 100% rename from package/firmware/cypress-nvram/files/brcmfmac4339-sdio.technexion,imx7d-pico-pi.txt rename to package/firmware/cypress-nvram/files/brcmfmac4339-sdio.AP6335.txt diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 2656f9c01f5..4a665ad7242 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware PKG_VERSION:=20221109 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/package/firmware/linux-firmware/broadcom.mk b/package/firmware/linux-firmware/broadcom.mk index c0d315c19c4..48d986e2183 100644 --- a/package/firmware/linux-firmware/broadcom.mk +++ b/package/firmware/linux-firmware/broadcom.mk @@ -47,23 +47,53 @@ define Package/brcmfmac-firmware-4329-sdio/install endef $(eval $(call BuildPackage,brcmfmac-firmware-4329-sdio)) -Package/brcmfmac-firmware-43430-sdio-rpi-3b = $(call Package/firmware-default,Broadcom BCM43430 NVRAM for Raspberry Pi 3B) -define Package/brcmfmac-firmware-43430-sdio-rpi-3b/install +Package/brcmfmac-nvram-43430-sdio = $(call Package/firmware-default,Broadcom BCM43430 SDIO NVRAM) +define Package/brcmfmac-nvram-43430-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcm/brcmfmac43430-sdio.AP6212.txt \ + $(1)/lib/firmware/brcm/ + $(LN) \ + brcmfmac43430-sdio.AP6212.txt \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt + $(LN) \ + brcmfmac43430-sdio.AP6212.txt \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt + $(LN) \ + brcmfmac43430-sdio.AP6212.txt \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt + $(LN) \ + brcmfmac43430-sdio.AP6212.txt \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt + $(LN) \ + brcmfmac43430-sdio.AP6212.txt \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-r1.txt + $(LN) \ + brcmfmac43430-sdio.AP6212.txt \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt + $(LN) \ + brcmfmac43430-sdio.AP6212.txt \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-a1.txt + $(LN) \ + brcmfmac43430-sdio.AP6212.txt \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-r0.txt + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt \ + $(1)/lib/firmware/brcm/ + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcm/brcmfmac43430-sdio.MUR1DX.txt \ + $(1)/lib/firmware/brcm/ $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt \ - $(1)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt -endef -$(eval $(call BuildPackage,brcmfmac-firmware-43430-sdio-rpi-3b)) - -Package/brcmfmac-firmware-43430-sdio-rpi-zero-w = $(call Package/firmware-default,Broadcom BCM43430 NVRAM for Raspberry Pi Zero W,+brcmfmac-firmware-43430-sdio-rpi-3b) -define Package/brcmfmac-firmware-43430-sdio-rpi-zero-w/install - $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(1)/lib/firmware/brcm/ $(LN) \ brcmfmac43430-sdio.raspberrypi,3-model-b.txt \ $(1)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt + $(LN) \ + brcmfmac43430-sdio.raspberrypi,3-model-b.txt \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt endef -$(eval $(call BuildPackage,brcmfmac-firmware-43430-sdio-rpi-zero-w)) +$(eval $(call BuildPackage,brcmfmac-nvram-43430-sdio)) Package/brcmfmac-firmware-43430a0-sdio = $(call Package/firmware-default,Broadcom BCM43430a0 FullMac SDIO firmware) define Package/brcmfmac-firmware-43430a0-sdio/install @@ -74,32 +104,50 @@ define Package/brcmfmac-firmware-43430a0-sdio/install endef $(eval $(call BuildPackage,brcmfmac-firmware-43430a0-sdio)) -Package/brcmfmac-firmware-43455-sdio-rpi-3b-plus = $(call Package/firmware-default,Broadcom BCM43455 NVRAM for Raspberry Pi 3B+) -define Package/brcmfmac-firmware-43455-sdio-rpi-3b-plus/install +Package/brcmfmac-nvram-43455-sdio = $(call Package/firmware-default,Broadcom BCM43455 SDIO NVRAM) +define Package/brcmfmac-nvram-43455-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.acepc-t8.txt \ + $(1)/lib/firmware/brcm/ $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \ - $(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt -endef -$(eval $(call BuildPackage,brcmfmac-firmware-43455-sdio-rpi-3b-plus)) - -Package/brcmfmac-firmware-43455-sdio-rpi-4b = $(call Package/firmware-default,Broadcom BCM43455 NVRAM for Raspberry Pi 4B) -define Package/brcmfmac-firmware-43455-sdio-rpi-4b/install - $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(1)/lib/firmware/brcm/ + $(LN) \ + brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt \ - $(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt -endef -$(eval $(call BuildPackage,brcmfmac-firmware-43455-sdio-rpi-4b)) - -Package/brcmfmac-firmware-43455-sdio-rpi-cm4 = $(call Package/firmware-default,Broadcom BCM43455 NVRAM for Raspberry Pi CM4,+brcmfmac-firmware-43455-sdio-rpi-4b) -define Package/brcmfmac-firmware-43455-sdio-rpi-cm4/install - $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(1)/lib/firmware/brcm/ $(LN) \ brcmfmac43455-sdio.raspberrypi,4-model-b.txt \ $(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt + $(LN) \ + brcmfmac43455-sdio.raspberrypi,4-model-b.txt \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ 4\ Model\ B.txt + $(LN) \ + brcmfmac43455-sdio.raspberrypi,4-model-b.txt \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ Compute\ Module\ 4.txt + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.MINIX-NEO\ Z83-4.txt \ + $(1)/lib/firmware/brcm/ + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.AW-CM256SM.txt \ + $(1)/lib/firmware/brcm/ + $(LN) \ + brcmfmac43455-sdio.AW-CM256SM.txt \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.beagle,am5729-beagleboneai.txt + $(LN) \ + brcmfmac43455-sdio.AW-CM256SM.txt \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.pine64,pinebook-pro.txt + $(LN) \ + brcmfmac43455-sdio.AW-CM256SM.txt \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.pine64,pinephone-pro.txt + $(LN) \ + brcmfmac43455-sdio.AW-CM256SM.txt \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.pine64,quartz64-b.txt endef -$(eval $(call BuildPackage,brcmfmac-firmware-43455-sdio-rpi-cm4)) +$(eval $(call BuildPackage,brcmfmac-nvram-43455-sdio)) Package/brcmfmac-firmware-usb = $(call Package/firmware-default,Broadcom BCM43xx fullmac USB firmware) define Package/brcmfmac-firmware-usb/install diff --git a/target/linux/bcm27xx/image/Makefile b/target/linux/bcm27xx/image/Makefile index e605a9a5c8e..1334386c574 100644 --- a/target/linux/bcm27xx/image/Makefile +++ b/target/linux/bcm27xx/image/Makefile @@ -76,7 +76,7 @@ define Device/rpi raspberrypi,model-zero raspberrypi,model-zero-w DEVICE_PACKAGES := \ cypress-firmware-43430-sdio \ - brcmfmac-firmware-43430-sdio-rpi-zero-w \ + brcmfmac-nvram-43430-sdio \ kmod-brcmfmac wpad-basic-wolfssl endef ifeq ($(SUBTARGET),bcm2708) @@ -107,11 +107,9 @@ define Device/rpi-2 raspberrypi,model-zero-2 DEVICE_PACKAGES := \ cypress-firmware-43430-sdio \ - brcmfmac-firmware-43430-sdio-rpi-3b \ + brcmfmac-nvram-43430-sdio \ cypress-firmware-43455-sdio \ - brcmfmac-firmware-43455-sdio-rpi-3b-plus \ - brcmfmac-firmware-43455-sdio-rpi-4b \ - brcmfmac-firmware-43455-sdio-rpi-cm4 \ + brcmfmac-nvram-43455-sdio \ kmod-brcmfmac wpad-basic-wolfssl IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip | append-metadata IMAGE/factory.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip @@ -140,9 +138,9 @@ define Device/rpi-3 raspberrypi,model-zero-2 DEVICE_PACKAGES := \ cypress-firmware-43430-sdio \ - brcmfmac-firmware-43430-sdio-rpi-3b \ + brcmfmac-nvram-43430-sdio \ cypress-firmware-43455-sdio \ - brcmfmac-firmware-43455-sdio-rpi-3b-plus \ + brcmfmac-nvram-43455-sdio \ kmod-brcmfmac wpad-basic-wolfssl endef ifeq ($(SUBTARGET),bcm2710) @@ -163,8 +161,7 @@ define Device/rpi-4 raspberrypi,4-model-b DEVICE_PACKAGES := \ cypress-firmware-43455-sdio \ - brcmfmac-firmware-43455-sdio-rpi-4b \ - brcmfmac-firmware-43455-sdio-rpi-cm4 \ + brcmfmac-nvram-43455-sdio \ kmod-brcmfmac wpad-basic-wolfssl \ kmod-usb-net-lan78xx IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | sdcard-img | gzip | append-metadata diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index 103fe6de15f..5010091ea97 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -2970,6 +2970,7 @@ CONFIG_LBDAF=y CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_PARTITION is not set CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y +# CONFIG_LD_HEAD_STUB_CATCH is not set # CONFIG_LEDS_AN30259A is not set # CONFIG_LEDS_APU is not set # CONFIG_LEDS_AW2013 is not set diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15 index c36cba70538..735b3d05886 100644 --- a/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15 @@ -3082,6 +3082,7 @@ CONFIG_LBDAF=y CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_PARTITION is not set CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y +# CONFIG_LD_HEAD_STUB_CATCH is not set # CONFIG_LEDS_AN30259A is not set # CONFIG_LEDS_APU is not set # CONFIG_LEDS_AW2013 is not set diff --git a/target/linux/imx/image/cortexa7.mk b/target/linux/imx/image/cortexa7.mk index 6306ed421dd..d5a23fc6e9e 100644 --- a/target/linux/imx/image/cortexa7.mk +++ b/target/linux/imx/image/cortexa7.mk @@ -21,7 +21,7 @@ define Device/technexion_imx7d-pico-pi DEVICE_PACKAGES := kmod-sound-core kmod-sound-soc-imx kmod-sound-soc-imx-sgtl5000 \ kmod-can kmod-can-flexcan kmod-can-raw kmod-leds-gpio \ kmod-input-touchscreen-edt-ft5x06 kmod-usb-hid kmod-btsdio \ - kmod-brcmfmac brcmfmac-firmware-4339-sdio cypress-nvram-4339-pico-pi-imx7d + kmod-brcmfmac brcmfmac-firmware-4339-sdio cypress-nvram-4339-sdio FILESYSTEMS := squashfs IMAGES := combined.bin sysupgrade.bin IMAGE/combined.bin := append-rootfs | pad-extra 128k | imx-sdcard-raw-uboot diff --git a/target/linux/qoriq/config-5.10 b/target/linux/qoriq/config-5.10 index 5bf31de3ea0..c40f2b3084b 100644 --- a/target/linux/qoriq/config-5.10 +++ b/target/linux/qoriq/config-5.10 @@ -194,7 +194,6 @@ CONFIG_KERNEL_GZIP=y CONFIG_KERNEL_START=0xc000000000000000 CONFIG_KPROBES=y CONFIG_KRETPROBES=y -# CONFIG_LD_HEAD_STUB_CATCH is not set CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y diff --git a/target/linux/qoriq/config-5.15 b/target/linux/qoriq/config-5.15 index ef6442a1b1f..bf487462d5e 100644 --- a/target/linux/qoriq/config-5.15 +++ b/target/linux/qoriq/config-5.15 @@ -201,7 +201,6 @@ CONFIG_KERNEL_GZIP=y CONFIG_KERNEL_START=0xc000000000000000 CONFIG_KPROBES=y CONFIG_KRETPROBES=y -# CONFIG_LD_HEAD_STUB_CATCH is not set CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y