generic: backport accepted and pending patches for mtk_eth_soc

[openwrt/staging/dangole.git] / include / trusted-firmware-a.mk

diff --git a/include/trusted-firmware-a.mk b/include/trusted-firmware-a.mk
index 0b37c0f94382599c4e6ed7a207ca435dfef5eb4a..e469dae9840087f2fe6c237efc1315ccebc0134b 100644 (file)
--- a/include/trusted-firmware-a.mk
+++ b/include/trusted-firmware-a.mk
@@ -1,5 +1,5 @@
 PKG_NAME ?= trusted-firmware-a
-PKG_CPE_ID ?= cpe:/a:arm:arm_trusted_firmware
+PKG_CPE_ID ?= cpe:/a:arm:trusted_firmware-a
 
 ifndef PKG_SOURCE_PROTO
 PKG_SOURCE = trusted-firmware-a-$(PKG_VERSION).tar.gz
@@ -63,9 +63,11 @@ define Build/Trusted-Firmware-A/Target
     URL:=https://www.trustedfirmware.org/projects/tf-a/
   endef
 
-  define Package/trusted-firmware-a-$(1)/install
+  ifndef Package/trusted-firmware-a-$(1)/install
+    define Package/trusted-firmware-a-$(1)/install
        $$(Package/trusted-firmware-a/install)
-  endef
+    endef
+  endif
 endef
 
 define Build/Configure/Trusted-Firmware-A
@@ -81,7 +83,7 @@ define Build/Compile/Trusted-Firmware-A
                $(if $(DTC),DTC="$(DTC)") \
                PLAT=$(PLAT) \
                BUILD_STRING="OpenWrt v$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \
-               $(if $(CONFIG_BINUTILS_VERSION_2_39),LDFLAGS="-no-warn-rwx-segments") \
+               $(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
                $(TFA_MAKE_FLAGS)
 endef