From 7d7aa2fd924c27829ec25f825481554dd81bce97 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 8 Feb 2020 21:58:55 +0100 Subject: brcm2708: rename target to bcm27xx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler Acked-by: Álvaro Fernández Rojas --- package/firmware/cypress-nvram/Makefile | 8 +- package/kernel/bcm27xx-gpu-fw/Makefile | 192 +++++++++++++++++++++ package/kernel/brcm2708-gpu-fw/Makefile | 192 --------------------- package/kernel/linux/modules/netdevices.mk | 4 +- package/kernel/mac80211/broadcom.mk | 2 +- package/utils/bcm27xx-userland/Makefile | 64 +++++++ .../001-interface-vcms_host-cmake-fixes.patch | 11 ++ package/utils/brcm2708-userland/Makefile | 64 ------- .../001-interface-vcms_host-cmake-fixes.patch | 11 -- 9 files changed, 274 insertions(+), 274 deletions(-) create mode 100644 package/kernel/bcm27xx-gpu-fw/Makefile delete mode 100644 package/kernel/brcm2708-gpu-fw/Makefile create mode 100644 package/utils/bcm27xx-userland/Makefile create mode 100644 package/utils/bcm27xx-userland/patches/001-interface-vcms_host-cmake-fixes.patch delete mode 100644 package/utils/brcm2708-userland/Makefile delete mode 100644 package/utils/brcm2708-userland/patches/001-interface-vcms_host-cmake-fixes.patch (limited to 'package') diff --git a/package/firmware/cypress-nvram/Makefile b/package/firmware/cypress-nvram/Makefile index 418a2b0d7e..ef4044c6d0 100644 --- a/package/firmware/cypress-nvram/Makefile +++ b/package/firmware/cypress-nvram/Makefile @@ -34,7 +34,7 @@ endef define Package/cypress-nvram-43430-sdio-rpi-3b $(Package/cypress-nvram-default) TITLE:=CYW43430 NVRAM for Raspberry Pi 3B - DEPENDS:=@TARGET_brcm2708 + DEPENDS:=@TARGET_bcm27xx endef define Package/cypress-nvram-43430-sdio-rpi-3b/install @@ -50,7 +50,7 @@ $(eval $(call BuildPackage,cypress-nvram-43430-sdio-rpi-3b)) define Package/cypress-nvram-43430-sdio-rpi-zero-w $(Package/cypress-nvram-default) TITLE:=CYW43430 NVRAM for Raspberry Pi Zero W - DEPENDS:=@TARGET_brcm2708 + DEPENDS:=@TARGET_bcm27xx endef define Package/cypress-nvram-43430-sdio-rpi-zero-w/install @@ -66,7 +66,7 @@ $(eval $(call BuildPackage,cypress-nvram-43430-sdio-rpi-zero-w)) define Package/cypress-nvram-43455-sdio-rpi-3b-plus $(Package/cypress-nvram-default) TITLE:=CYW43455 NVRAM for Raspberry Pi 3B+ - DEPENDS:=@TARGET_brcm2708 + DEPENDS:=@TARGET_bcm27xx endef define Package/cypress-nvram-43455-sdio-rpi-3b-plus/install @@ -82,7 +82,7 @@ $(eval $(call BuildPackage,cypress-nvram-43455-sdio-rpi-3b-plus)) define Package/cypress-nvram-43455-sdio-rpi-4b $(Package/cypress-nvram-default) TITLE:=CYW43455 NVRAM for Raspberry Pi 4B - DEPENDS:=@TARGET_brcm2708 + DEPENDS:=@TARGET_bcm27xx endef define Package/cypress-nvram-43455-sdio-rpi-4b/install diff --git a/package/kernel/bcm27xx-gpu-fw/Makefile b/package/kernel/bcm27xx-gpu-fw/Makefile new file mode 100644 index 0000000000..bbaff39cc6 --- /dev/null +++ b/package/kernel/bcm27xx-gpu-fw/Makefile @@ -0,0 +1,192 @@ +# +# Copyright (C) 2012-2020 OpenWrt.org +# Copyright (C) 2017 LEDE project +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=bcm27xx-gpu-fw +PKG_VERSION:=2020-01-30 +PKG_RELEASE:=63bdbe0ea609a69f5c0a2212d608ef3d9915a7ad + +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/rpi-firmware-$(PKG_RELEASE) + +PKG_FLAGS:=nonshared + +include $(INCLUDE_DIR)/package.mk + +RPI_FIRMWARE_URL:=@GITHUB/raspberrypi/firmware/$(PKG_RELEASE)/boot/ +RPI_FIRMWARE_FILE:=rpi-firmware-$(PKG_RELEASE) + +define Download/LICENCE_broadcom + FILE:=$(RPI_FIRMWARE_FILE)-LICENCE.broadcom + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=LICENCE.broadcom + HASH:=c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b +endef +$(eval $(call Download,LICENCE_broadcom)) + +define Download/bootcode_bin + FILE:=$(RPI_FIRMWARE_FILE)-bootcode.bin + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=bootcode.bin + HASH:=6505bbc8798698bd8f1dff30789b22289ebb865ccba7833b87705264525cbe46 +endef +$(eval $(call Download,bootcode_bin)) + +define Download/fixup_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup.dat + HASH:=7ca06846314d7a0d0335cadd6081ea50578f450ed0ec98d284220cea1021199f +endef +$(eval $(call Download,fixup_dat)) + +define Download/fixup_cd_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup_cd.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup_cd.dat + HASH:=fb8e8b196f9fd7bd16b00b8ed8a4d3231fb24c2910a4a10929b5f4f693ad69ef +endef +$(eval $(call Download,fixup_cd_dat)) + +define Download/fixup_x_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup_x.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup_x.dat + HASH:=65e0c34b5d17009d7a79f5d0ae81ced8b3649cc77258f29edb7e9b15d197634c +endef +$(eval $(call Download,fixup_x_dat)) + +define Download/fixup4_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup4.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup4.dat + HASH:=d040dff3e48d645e474ef9c108651e9d4d6708f75aa50799148a1917724e5d27 +endef +$(eval $(call Download,fixup4_dat)) + +define Download/fixup4cd_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup4cd.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup4cd.dat + HASH:=2a3366d0f7ea5c2d39da41f9a2c68aa84a14641dbf122dccc275e0d548296c0d +endef +$(eval $(call Download,fixup4cd_dat)) + +define Download/fixup4x_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup4x.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup4x.dat + HASH:=6c6e9fec9e769d1bff3cf6775b12a5f640fbd810c3a1427318509a929b854a5b +endef +$(eval $(call Download,fixup4x_dat)) + +define Download/start_elf + FILE:=$(RPI_FIRMWARE_FILE)-start.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start.elf + HASH:=2cde27f015b244b35b2261fe468924298b4c3d0ea12b69f99cd0bd9d1fcadf9c +endef +$(eval $(call Download,start_elf)) + +define Download/start_cd_elf + FILE:=$(RPI_FIRMWARE_FILE)-start_cd.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start_cd.elf + HASH:=5151679b5128c3cedbeb2992d8c6f8f13ce919282f6a98e87af0fe13b2686142 +endef +$(eval $(call Download,start_cd_elf)) + +define Download/start_x_elf + FILE:=$(RPI_FIRMWARE_FILE)-start_x.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start_x.elf + HASH:=e4ee556a657adf5f5b1c006bfd7f7278e3cd76807adc3eb23f192f37759b674e +endef +$(eval $(call Download,start_x_elf)) + +define Download/start4_elf + FILE:=$(RPI_FIRMWARE_FILE)-start4.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start4.elf + HASH:=fc9a3b7a07bc901f677cc15420ac1c66d5b55bd1c697b07ee54ee5bbf92a7cc5 +endef +$(eval $(call Download,start4_elf)) + +define Download/start4cd_elf + FILE:=$(RPI_FIRMWARE_FILE)-start4cd.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start4cd.elf + HASH:=b75ef404d1e222e84b64e7410e9c9633a643db196421c144ace51454a2a0f504 +endef +$(eval $(call Download,start4cd_elf)) + +define Download/start4x_elf + FILE:=$(RPI_FIRMWARE_FILE)-start4x.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start4x.elf + HASH:=db639727412e80d1a7b0dfd9f8cb0b71318f8663ece7e6b20a3804526c6a330d +endef +$(eval $(call Download,start4x_elf)) + +define Package/bcm27xx-gpu-fw + SECTION:=boot + CATEGORY:=Boot Loaders + DEPENDS:=@TARGET_bcm27xx + TITLE:=bcm27xx-gpu-fw + DEFAULT:=y if TARGET_bcm27xx +endef + +define Package/bcm27xx-gpu-fw/description + GPU and kernel boot firmware for bcm27xx. +endef + +define Build/Prepare + rm -rf $(PKG_BUILD_DIR) + mkdir -p $(PKG_BUILD_DIR) + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-LICENCE.broadcom $(PKG_BUILD_DIR)/LICENCE.broadcom + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-bootcode.bin $(PKG_BUILD_DIR)/bootcode.bin + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup.dat $(PKG_BUILD_DIR)/fixup.dat + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup_cd.dat $(PKG_BUILD_DIR)/fixup_cd.dat + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup_x.dat $(PKG_BUILD_DIR)/fixup_x.dat + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup4.dat $(PKG_BUILD_DIR)/fixup4.dat + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup4cd.dat $(PKG_BUILD_DIR)/fixup4cd.dat + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup4x.dat $(PKG_BUILD_DIR)/fixup4x.dat + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start.elf $(PKG_BUILD_DIR)/start.elf + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start_cd.elf $(PKG_BUILD_DIR)/start_cd.elf + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start_x.elf $(PKG_BUILD_DIR)/start_x.elf + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start4.elf $(PKG_BUILD_DIR)/start4.elf + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start4cd.elf $(PKG_BUILD_DIR)/start4cd.elf + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start4x.elf $(PKG_BUILD_DIR)/start4x.elf +endef + +define Build/Compile + true +endef + +define Package/bcm27xx-gpu-fw/install + true +endef + +define Build/InstallDev + $(CP) $(PKG_BUILD_DIR)/bootcode.bin $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/LICENCE.broadcom $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start_cd.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start_x.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start4.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start4cd.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/start4x.elf $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup.dat $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup_cd.dat $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup_x.dat $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup4.dat $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup4cd.dat $(KERNEL_BUILD_DIR) + $(CP) $(PKG_BUILD_DIR)/fixup4x.dat $(KERNEL_BUILD_DIR) +endef + +$(eval $(call BuildPackage,bcm27xx-gpu-fw)) diff --git a/package/kernel/brcm2708-gpu-fw/Makefile b/package/kernel/brcm2708-gpu-fw/Makefile deleted file mode 100644 index fa53f48333..0000000000 --- a/package/kernel/brcm2708-gpu-fw/Makefile +++ /dev/null @@ -1,192 +0,0 @@ -# -# Copyright (C) 2012-2020 OpenWrt.org -# Copyright (C) 2017 LEDE project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=brcm2708-gpu-fw -PKG_VERSION:=2020-01-30 -PKG_RELEASE:=63bdbe0ea609a69f5c0a2212d608ef3d9915a7ad - -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/rpi-firmware-$(PKG_RELEASE) - -PKG_FLAGS:=nonshared - -include $(INCLUDE_DIR)/package.mk - -RPI_FIRMWARE_URL:=@GITHUB/raspberrypi/firmware/$(PKG_RELEASE)/boot/ -RPI_FIRMWARE_FILE:=rpi-firmware-$(PKG_RELEASE) - -define Download/LICENCE_broadcom - FILE:=$(RPI_FIRMWARE_FILE)-LICENCE.broadcom - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=LICENCE.broadcom - HASH:=c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b -endef -$(eval $(call Download,LICENCE_broadcom)) - -define Download/bootcode_bin - FILE:=$(RPI_FIRMWARE_FILE)-bootcode.bin - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=bootcode.bin - HASH:=6505bbc8798698bd8f1dff30789b22289ebb865ccba7833b87705264525cbe46 -endef -$(eval $(call Download,bootcode_bin)) - -define Download/fixup_dat - FILE:=$(RPI_FIRMWARE_FILE)-fixup.dat - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=fixup.dat - HASH:=7ca06846314d7a0d0335cadd6081ea50578f450ed0ec98d284220cea1021199f -endef -$(eval $(call Download,fixup_dat)) - -define Download/fixup_cd_dat - FILE:=$(RPI_FIRMWARE_FILE)-fixup_cd.dat - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=fixup_cd.dat - HASH:=fb8e8b196f9fd7bd16b00b8ed8a4d3231fb24c2910a4a10929b5f4f693ad69ef -endef -$(eval $(call Download,fixup_cd_dat)) - -define Download/fixup_x_dat - FILE:=$(RPI_FIRMWARE_FILE)-fixup_x.dat - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=fixup_x.dat - HASH:=65e0c34b5d17009d7a79f5d0ae81ced8b3649cc77258f29edb7e9b15d197634c -endef -$(eval $(call Download,fixup_x_dat)) - -define Download/fixup4_dat - FILE:=$(RPI_FIRMWARE_FILE)-fixup4.dat - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=fixup4.dat - HASH:=d040dff3e48d645e474ef9c108651e9d4d6708f75aa50799148a1917724e5d27 -endef -$(eval $(call Download,fixup4_dat)) - -define Download/fixup4cd_dat - FILE:=$(RPI_FIRMWARE_FILE)-fixup4cd.dat - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=fixup4cd.dat - HASH:=2a3366d0f7ea5c2d39da41f9a2c68aa84a14641dbf122dccc275e0d548296c0d -endef -$(eval $(call Download,fixup4cd_dat)) - -define Download/fixup4x_dat - FILE:=$(RPI_FIRMWARE_FILE)-fixup4x.dat - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=fixup4x.dat - HASH:=6c6e9fec9e769d1bff3cf6775b12a5f640fbd810c3a1427318509a929b854a5b -endef -$(eval $(call Download,fixup4x_dat)) - -define Download/start_elf - FILE:=$(RPI_FIRMWARE_FILE)-start.elf - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=start.elf - HASH:=2cde27f015b244b35b2261fe468924298b4c3d0ea12b69f99cd0bd9d1fcadf9c -endef -$(eval $(call Download,start_elf)) - -define Download/start_cd_elf - FILE:=$(RPI_FIRMWARE_FILE)-start_cd.elf - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=start_cd.elf - HASH:=5151679b5128c3cedbeb2992d8c6f8f13ce919282f6a98e87af0fe13b2686142 -endef -$(eval $(call Download,start_cd_elf)) - -define Download/start_x_elf - FILE:=$(RPI_FIRMWARE_FILE)-start_x.elf - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=start_x.elf - HASH:=e4ee556a657adf5f5b1c006bfd7f7278e3cd76807adc3eb23f192f37759b674e -endef -$(eval $(call Download,start_x_elf)) - -define Download/start4_elf - FILE:=$(RPI_FIRMWARE_FILE)-start4.elf - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=start4.elf - HASH:=fc9a3b7a07bc901f677cc15420ac1c66d5b55bd1c697b07ee54ee5bbf92a7cc5 -endef -$(eval $(call Download,start4_elf)) - -define Download/start4cd_elf - FILE:=$(RPI_FIRMWARE_FILE)-start4cd.elf - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=start4cd.elf - HASH:=b75ef404d1e222e84b64e7410e9c9633a643db196421c144ace51454a2a0f504 -endef -$(eval $(call Download,start4cd_elf)) - -define Download/start4x_elf - FILE:=$(RPI_FIRMWARE_FILE)-start4x.elf - URL:=$(RPI_FIRMWARE_URL) - URL_FILE:=start4x.elf - HASH:=db639727412e80d1a7b0dfd9f8cb0b71318f8663ece7e6b20a3804526c6a330d -endef -$(eval $(call Download,start4x_elf)) - -define Package/brcm2708-gpu-fw - SECTION:=boot - CATEGORY:=Boot Loaders - DEPENDS:=@TARGET_brcm2708 - TITLE:=brcm2708-gpu-fw - DEFAULT:=y if TARGET_brcm2708 -endef - -define Package/brcm2708-gpu-fw/description - GPU and kernel boot firmware for brcm2708. -endef - -define Build/Prepare - rm -rf $(PKG_BUILD_DIR) - mkdir -p $(PKG_BUILD_DIR) - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-LICENCE.broadcom $(PKG_BUILD_DIR)/LICENCE.broadcom - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-bootcode.bin $(PKG_BUILD_DIR)/bootcode.bin - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup.dat $(PKG_BUILD_DIR)/fixup.dat - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup_cd.dat $(PKG_BUILD_DIR)/fixup_cd.dat - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup_x.dat $(PKG_BUILD_DIR)/fixup_x.dat - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup4.dat $(PKG_BUILD_DIR)/fixup4.dat - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup4cd.dat $(PKG_BUILD_DIR)/fixup4cd.dat - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup4x.dat $(PKG_BUILD_DIR)/fixup4x.dat - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start.elf $(PKG_BUILD_DIR)/start.elf - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start_cd.elf $(PKG_BUILD_DIR)/start_cd.elf - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start_x.elf $(PKG_BUILD_DIR)/start_x.elf - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start4.elf $(PKG_BUILD_DIR)/start4.elf - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start4cd.elf $(PKG_BUILD_DIR)/start4cd.elf - cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start4x.elf $(PKG_BUILD_DIR)/start4x.elf -endef - -define Build/Compile - true -endef - -define Package/brcm2708-gpu-fw/install - true -endef - -define Build/InstallDev - $(CP) $(PKG_BUILD_DIR)/bootcode.bin $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/LICENCE.broadcom $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/start.elf $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/start_cd.elf $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/start_x.elf $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/start4.elf $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/start4cd.elf $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/start4x.elf $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/fixup.dat $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/fixup_cd.dat $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/fixup_x.dat $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/fixup4.dat $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/fixup4cd.dat $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/fixup4x.dat $(KERNEL_BUILD_DIR) -endef - -$(eval $(call BuildPackage,brcm2708-gpu-fw)) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 7aa97a8d9b..4fcd03ae85 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -125,7 +125,7 @@ $(eval $(call KernelPackage,mii)) define KernelPackage/mdio-gpio SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:= Supports GPIO lib-based MDIO busses - DEPENDS:=+kmod-libphy @GPIO_SUPPORT +(TARGET_armvirt||TARGET_brcm2708_bcm2708||TARGET_samsung||TARGET_tegra):kmod-of-mdio + DEPENDS:=+kmod-libphy @GPIO_SUPPORT +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_samsung||TARGET_tegra):kmod-of-mdio KCONFIG:= \ CONFIG_MDIO_BITBANG \ CONFIG_MDIO_GPIO @@ -320,7 +320,7 @@ $(eval $(call KernelPackage,switch-rtl8306)) define KernelPackage/switch-rtl8366-smi SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Realtek RTL8366 SMI switch interface support - DEPENDS:=@GPIO_SUPPORT +kmod-swconfig +(TARGET_armvirt||TARGET_brcm2708_bcm2708||TARGET_samsung||TARGET_tegra):kmod-of-mdio + DEPENDS:=@GPIO_SUPPORT +kmod-swconfig +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_samsung||TARGET_tegra):kmod-of-mdio KCONFIG:=CONFIG_RTL8366_SMI FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8366_smi.ko AUTOLOAD:=$(call AutoLoad,42,rtl8366_smi) diff --git a/package/kernel/mac80211/broadcom.mk b/package/kernel/mac80211/broadcom.mk index c725c4924f..41320bcc12 100644 --- a/package/kernel/mac80211/broadcom.mk +++ b/package/kernel/mac80211/broadcom.mk @@ -449,7 +449,7 @@ define KernelPackage/brcmfmac/config config BRCMFMAC_SDIO bool "Enable SDIO bus interface support" - default y if TARGET_brcm2708 + default y if TARGET_bcm27xx default y if TARGET_sunxi default n help diff --git a/package/utils/bcm27xx-userland/Makefile b/package/utils/bcm27xx-userland/Makefile new file mode 100644 index 0000000000..718e853993 --- /dev/null +++ b/package/utils/bcm27xx-userland/Makefile @@ -0,0 +1,64 @@ +# +# Copyright (C) 2019 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=bcm27xx-userland +PKG_VERSION:=42ec119e03eb8dffc7c83e2ac0e665e333abbef6 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/userland/tar.gz/$(PKG_VERSION)? +PKG_HASH:=cb0f1d653fdb9975783f30359277d9de2868607381e081796eac68745e3e8324 + +PKG_FLAGS:=nonshared + +PKG_MAINTAINER:=Álvaro Fernández Rojas + +CMAKE_INSTALL:=1 +CMAKE_OPTIONS+=-DVMCS_INSTALL_PREFIX=/usr + +ifeq ($(ARCH),aarch64) + CMAKE_OPTIONS+=-DARM64=ON +else + CMAKE_OPTIONS+=-DARM64=OFF +endif + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + +define Package/bcm27xx-userland + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=@TARGET_bcm27xx + TITLE:=BCM27xx userland tools + DEFAULT:=y if TARGET_bcm27xx +endef + +define Package/bcm27xx-userland/description + BCM27xx userland tools including vcgencmd and tvservice. +endef + +define Package/bcm27xx-userland/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtparam $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtoverlay $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tvservice $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcgencmd $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcmailbox $(1)/usr/bin + + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/ $(1)/usr/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/ $(1)/usr/ +endef + +$(eval $(call BuildPackage,bcm27xx-userland)) diff --git a/package/utils/bcm27xx-userland/patches/001-interface-vcms_host-cmake-fixes.patch b/package/utils/bcm27xx-userland/patches/001-interface-vcms_host-cmake-fixes.patch new file mode 100644 index 0000000000..cb73512af9 --- /dev/null +++ b/package/utils/bcm27xx-userland/patches/001-interface-vcms_host-cmake-fixes.patch @@ -0,0 +1,11 @@ +--- a/interface/vmcs_host/CMakeLists.txt ++++ b/interface/vmcs_host/CMakeLists.txt +@@ -24,7 +24,7 @@ if(NOT ARM64) + + # ILCS pulls in EGL for the ILCS/EGL surface API support + target_link_libraries(vcilcs brcmEGL brcmGLESv2 khrn_client vchiq_arm vcos) +- set(INSTALL_TARGETS "${INSTALL_TARGETS} vcilcs") ++ set(INSTALL_TARGETS ${INSTALL_TARGETS} vcilcs) + endif() + + # vchostif needs ilcore as well (vmcs_main pulls it in) diff --git a/package/utils/brcm2708-userland/Makefile b/package/utils/brcm2708-userland/Makefile deleted file mode 100644 index 7fea952974..0000000000 --- a/package/utils/brcm2708-userland/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (C) 2019 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=brcm2708-userland -PKG_VERSION:=42ec119e03eb8dffc7c83e2ac0e665e333abbef6 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/userland/tar.gz/$(PKG_VERSION)? -PKG_HASH:=cb0f1d653fdb9975783f30359277d9de2868607381e081796eac68745e3e8324 - -PKG_FLAGS:=nonshared - -PKG_MAINTAINER:=Álvaro Fernández Rojas - -CMAKE_INSTALL:=1 -CMAKE_OPTIONS+=-DVMCS_INSTALL_PREFIX=/usr - -ifeq ($(ARCH),aarch64) - CMAKE_OPTIONS+=-DARM64=ON -else - CMAKE_OPTIONS+=-DARM64=OFF -endif - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) -TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) - -define Package/brcm2708-userland - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=@TARGET_brcm2708 - TITLE:=BCM2708 userland tools - DEFAULT:=y if TARGET_brcm2708 -endef - -define Package/brcm2708-userland/description - BCM2708 userland tools including vcgencmd and tvservice. -endef - -define Package/brcm2708-userland/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtparam $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtoverlay $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tvservice $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcgencmd $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcmailbox $(1)/usr/bin - - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/ $(1)/usr/ - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/ $(1)/usr/ -endef - -$(eval $(call BuildPackage,brcm2708-userland)) diff --git a/package/utils/brcm2708-userland/patches/001-interface-vcms_host-cmake-fixes.patch b/package/utils/brcm2708-userland/patches/001-interface-vcms_host-cmake-fixes.patch deleted file mode 100644 index cb73512af9..0000000000 --- a/package/utils/brcm2708-userland/patches/001-interface-vcms_host-cmake-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/interface/vmcs_host/CMakeLists.txt -+++ b/interface/vmcs_host/CMakeLists.txt -@@ -24,7 +24,7 @@ if(NOT ARM64) - - # ILCS pulls in EGL for the ILCS/EGL surface API support - target_link_libraries(vcilcs brcmEGL brcmGLESv2 khrn_client vchiq_arm vcos) -- set(INSTALL_TARGETS "${INSTALL_TARGETS} vcilcs") -+ set(INSTALL_TARGETS ${INSTALL_TARGETS} vcilcs) - endif() - - # vchostif needs ilcore as well (vmcs_main pulls it in) -- cgit v1.2.3