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/utils/bcm27xx-userland/Makefile | 64 ++++++++++++++++++++++ .../001-interface-vcms_host-cmake-fixes.patch | 11 ++++ 2 files changed, 75 insertions(+) create mode 100644 package/utils/bcm27xx-userland/Makefile create mode 100644 package/utils/bcm27xx-userland/patches/001-interface-vcms_host-cmake-fixes.patch (limited to 'package/utils/bcm27xx-userland') 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) -- cgit v1.2.3