From 22fd8b0df6ca4abc972ab79242b6307468983c00 Mon Sep 17 00:00:00 2001 From: Kuan-Yi Li Date: Wed, 16 Nov 2022 12:47:41 +0800 Subject: [PATCH] cypress-nvram: disassociate from external source repo MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since all NVRAM files in external repo are now upstreamed and to lower future maintenance cost, disassociate the package from external source repo. All upstream pending NVRAM files shall be stored locally from now on. Signed-off-by: Kuan-Yi Li [Remove outdated URL, add SPDX-License-Identifier] Signed-off-by: Álvaro Fernández Rojas --- package/firmware/cypress-nvram/Makefile | 119 +++--------------- ...co-pi.txt => brcmfmac4339-sdio.AP6335.txt} | 0 target/linux/imx/image/cortexa7.mk | 2 +- 3 files changed, 19 insertions(+), 102 deletions(-) rename package/firmware/cypress-nvram/files/{brcmfmac4339-sdio.technexion,imx7d-pico-pi.txt => brcmfmac4339-sdio.AP6335.txt} (100%) diff --git a/package/firmware/cypress-nvram/Makefile b/package/firmware/cypress-nvram/Makefile index 7c999540ca..b08f6ca63c 100644 --- a/package/firmware/cypress-nvram/Makefile +++ b/package/firmware/cypress-nvram/Makefile @@ -1,135 +1,52 @@ -# -# 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:=5 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 - $(Package/cypress-nvram-default) - TITLE:=CYW43430 NVRAM for Raspberry Pi 3B - DEPENDS:=@TARGET_bcm27xx - CONFLICTS:=brcmfmac-firmware-43430-sdio-rpi-3b -endef - -define Package/cypress-nvram-43430-sdio-rpi-3b/install - $(INSTALL_DIR) $(1)/lib/firmware/brcm - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/brcmfmac43430-sdio.raspberrypi,3-model-b.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 -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 +# Cypress 4339 SDIO AP6335 NVRAM +define Package/cypress-nvram-4339-sdio-ap6335 $(Package/cypress-nvram-default) - TITLE:=CYW43455 NVRAM for Raspberry Pi 3B+ - DEPENDS:=@TARGET_bcm27xx - CONFLICTS:=brcmfmac-firmware-43455-sdio-rpi-3b-plus + TITLE:=BCM4339 NVRAM for AP6335 + CONFLICTS:=brcmfmac-firmware-4339-sdio-ap6335 endef -define Package/cypress-nvram-43455-sdio-rpi-3b-plus/install +define Package/cypress-nvram-4339-sdio-ap6335/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \ + ./files/brcmfmac4339-sdio.AP6335.txt \ $(1)/lib/firmware/brcm/ endef -$(eval $(call BuildPackage,cypress-nvram-43455-sdio-rpi-3b-plus)) +$(eval $(call BuildPackage,cypress-nvram-4339-sdio-ap6335)) -# 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 +# Cypress 4339 SDIO PICO-PI-IMX7D NVRAM +define Package/cypress-nvram-4339-sdio-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 + DEPENDS:=+cypress-nvram-4339-sdio-ap6335 + CONFLICTS:=brcmfmac-firmware-4339-sdio-pico-pi-imx7d endef -define Package/cypress-nvram-4339-pico-pi-imx7d/install +define Package/cypress-nvram-4339-sdio-pico-pi-imx7d/install $(INSTALL_DIR) $(1)/lib/firmware/brcm - $(INSTALL_DATA) \ - ./files/brcmfmac4339-sdio.technexion,imx7d-pico-pi.txt \ - $(1)/lib/firmware/brcm/ + $(LN) \ + brcmfmac4339-sdio.AP6335.txt \ + $(1)/lib/firmware/brcm/brcmfmac4339-sdio.technexion,imx7d-pico-pi.txt endef -$(eval $(call BuildPackage,cypress-nvram-4339-pico-pi-imx7d)) +$(eval $(call BuildPackage,cypress-nvram-4339-sdio-pico-pi-imx7d)) 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/target/linux/imx/image/cortexa7.mk b/target/linux/imx/image/cortexa7.mk index 6306ed421d..00c57c3e12 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-pico-pi-imx7d FILESYSTEMS := squashfs IMAGES := combined.bin sysupgrade.bin IMAGE/combined.bin := append-rootfs | pad-extra 128k | imx-sdcard-raw-uboot -- 2.30.2