From 465471fbb9c4ab95132db59734c511c24adef632 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 26 Mar 2021 13:15:45 +0000 Subject: [PATCH] arm/scp-firmware: remove unused 2.6 version Change-Id: I3662f139ede7b60d8f0b929cbc40fbdb67be0d72 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../scp-firmware/scp-firmware_2.6%.bbappend | 5 -- ..._code-atomically-rewrite-the-generat.patch | 69 ----------------- .../scp-firmware/scp-firmware_2.6.0.bb | 76 ------------------- 3 files changed, 150 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend delete mode 100644 meta-arm/recipes-bsp/scp-firmware/files/0001-tools-gen_module_code-atomically-rewrite-the-generat.patch delete mode 100644 meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend deleted file mode 100644 index 0d71e555..00000000 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# Include machine specific SCP configurations - -MACHINE_SCP_REQUIRE ?= "" - -require ${MACHINE_SCP_REQUIRE} diff --git a/meta-arm/recipes-bsp/scp-firmware/files/0001-tools-gen_module_code-atomically-rewrite-the-generat.patch b/meta-arm/recipes-bsp/scp-firmware/files/0001-tools-gen_module_code-atomically-rewrite-the-generat.patch deleted file mode 100644 index 05bb025e..00000000 --- a/meta-arm/recipes-bsp/scp-firmware/files/0001-tools-gen_module_code-atomically-rewrite-the-generat.patch +++ /dev/null @@ -1,69 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 34e1c04534607f5605255f39fb46e26261fc9c4e Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Tue, 8 Sep 2020 11:49:08 +0100 -Subject: [PATCH] tools/gen_module_code: atomically rewrite the generated files - -The gen_module rule in rules.mk is marked as .PHONY, so make will -execute it whenever it is mentioned. This results in gen_module_code -being executed 64 times for a Juno build. - -However in heavily parallel builds there's a good chance that -gen_module_code is writing a file whilst the compiler is reading it -because make also doesn't know what files are generated by -gen_module_code. - -The correct fix is to adjust the Makefiles so that the dependencies are -correct but this isn't trivial, so band-aid the problem by atomically -writing the generated files. - -Change-Id: I82d44f9ea6537a91002e1f80de8861d208571630 -Signed-off-by: Ross Burton ---- - tools/gen_module_code.py | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/tools/gen_module_code.py b/tools/gen_module_code.py -index 7b395384..ee099b71 100755 ---- a/tools/gen_module_code.py -+++ b/tools/gen_module_code.py -@@ -17,6 +17,7 @@ - import argparse - import os - import sys -+import tempfile - - DEFAULT_PATH = 'build/' - -@@ -53,13 +54,21 @@ TEMPLATE_C = "/* This file was auto generated using {} */\n" \ - - def generate_file(path, filename, content): - full_filename = os.path.join(path, filename) -- with open(full_filename, 'a+') as f: -- f.seek(0) -- if f.read() != content: -+ -+ try: -+ with open(full_filename) as f: -+ rewrite = f.read() != content -+ except FileNotFoundError: -+ rewrite = True -+ -+ if rewrite: -+ with tempfile.NamedTemporaryFile(prefix="gen-module-code", -+ dir=path, -+ delete=False, -+ mode="wt") as f: - print("[GEN] {}...".format(full_filename)) -- f.seek(0) -- f.truncate() - f.write(content) -+ os.replace(f.name, full_filename) - - - def generate_header(path, modules): --- -2.28.0 - diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb deleted file mode 100644 index 123f442e..00000000 --- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb +++ /dev/null @@ -1,76 +0,0 @@ -SUMMARY = "SCP and MCP Firmware" -DESCRIPTION = "Firmware for SCP and MCP software reference implementation" -HOMEPAGE = "https://github.com/ARM-software/SCP-firmware" - -LICENSE = "BSD-3-Clause & Apache-2.0" -LIC_FILES_CHKSUM = "file://license.md;beginline=5;md5=9db9e3d2fb8d9300a6c3d15101b19731 \ - file://cmsis/LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e" - -SRC_URI = "gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https \ - file://0001-tools-gen_module_code-atomically-rewrite-the-generat.patch" -SRCREV = "db19910aca6d1032eb0329e5fbb70a92b997f6f2" - -PROVIDES += "virtual/control-processor-firmware" - -SCP_BUILD_RELEASE ?= "1" -SCP_PLATFORM ?= "invalid" -SCP_COMPILER ?= "arm-none-eabi" -SCP_LOG_LEVEL ?= "WARN" - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "virtual/arm-none-eabi-gcc-native" - -SCP_BUILD_STR = "${@bb.utils.contains('SCP_BUILD_RELEASE', '1', 'release', 'debug', d)}" - -inherit deploy - -B = "${WORKDIR}/build" -S = "${WORKDIR}/git" - -# Allow platform specific copying of only scp or both scp & mcp, default to both -FW_TARGETS ?= "scp mcp" -FW_INSTALL ?= "ramfw romfw" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE ?= "invalid" - -LDFLAGS[unexport] = "1" - -# No configure -do_configure[noexec] = "1" - -EXTRA_OEMAKE = "V=1 \ - BUILD_PATH='${B}' \ - PRODUCT='${SCP_PLATFORM}' \ - MODE='${SCP_BUILD_STR}' \ - LOG_LEVEL='${SCP_LOG_LEVEL}' \ - CC='${SCP_COMPILER}-gcc' \ - AR='${SCP_COMPILER}-ar' \ - SIZE='${SCP_COMPILER}-size' \ - OBJCOPY='${SCP_COMPILER}-objcopy' \ - " - -do_compile() { - oe_runmake -C "${S}" -} -do_compile[cleandirs] += "${B}" - -do_install() { - install -d ${D}/firmware - for FW in ${FW_TARGETS}; do - for TYPE in ${FW_INSTALL}; do - install -D "${B}/product/${SCP_PLATFORM}/${FW}_${TYPE}/${SCP_BUILD_STR}/bin/${FW}_${TYPE}.bin" "${D}/firmware/" - done - done -} - -FILES_${PN} = "/firmware" -SYSROOT_DIRS += "/firmware" -# Skip QA check for relocations in .text of elf binaries -INSANE_SKIP_${PN} = "textrel" - -do_deploy() { - # Copy the images to deploy directory - cp -rf ${D}/firmware/* ${DEPLOYDIR}/ -} -addtask deploy after do_install