From: "Jon Mason" <jdmason@kudzu.us>
To: Ross Burton <ross@burtonini.com>
Cc: meta-arm@lists.yoctoproject.org
Subject: Re: [meta-arm] [PATCH 1/9] arm/scp-firmware: merge bb/inc
Date: Thu, 30 Jul 2020 15:55:31 -0400 [thread overview]
Message-ID: <20200730195531.GB15405@kudzu.us> (raw)
In-Reply-To: <20200729101145.1794231-1-ross@burtonini.com>
On Wed, Jul 29, 2020 at 11:11:37AM +0100, Ross Burton wrote:
> From: Ross Burton <ross.burton@arm.com>
>
> There's no other recipe that uses scp-firmware.inc, so merge it into the
> recipe for clarity.
>
> Change-Id: Ife1874b54c8b2be2704e1d0f5a7013ff89b8ca6e
> Signed-off-by: Ross Burton <ross.burton@arm.com>
Series added to master.
Thanks,
Jon
> ---
> .../recipes-bsp/scp-firmware/scp-firmware.inc | 73 -------------------
> .../scp-firmware/scp-firmware_git.bb | 73 ++++++++++++++++++-
> 2 files changed, 72 insertions(+), 74 deletions(-)
> delete mode 100644 meta-arm/recipes-bsp/scp-firmware/scp-firmware.inc
>
> diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware.inc b/meta-arm/recipes-bsp/scp-firmware/scp-firmware.inc
> deleted file mode 100644
> index 2db59d3..0000000
> --- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware.inc
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -SUMMARY = "SCP and MCP Firmware"
> -
> -PROVIDES += "virtual/control-processor-firmware"
> -
> -SCP_BUILD_RELEASE ?= "1"
> -SCP_COMPILE_VERBOSE ?= "0"
> -SCP_PLATFORM ?= "invalid"
> -SCP_COMPILER ?= "arm-none-eabi"
> -SCP_LOG_LEVEL ?= "WARN"
> -
> -DEPENDS += "virtual/arm-none-eabi-gcc-native"
> -
> -SCP_BUILD_STR = "${@bb.utils.contains('SCP_BUILD_RELEASE', '1', 'release', 'debug', d)}"
> -SCP_COMP_STR = "${@bb.utils.contains('SCP_COMPILE_VERBOSE', '0', '', 'V=1', d)}"
> -
> -inherit python3native
> -inherit deploy
> -
> -B = "${WORKDIR}/build"
> -S = "${WORKDIR}/src"
> -
> -# Allow platform specific copying of only scp or both scp & mcp, default to both
> -FW_TARGETS ?= "scp mcp"
> -
> -COMPATIBLE_MACHINE ?= "invalid"
> -
> -LDFLAGS[unexport] = "1"
> -
> -# The gcc-arm-none-eabi version does not support -fmacro-prefix-max
> -DEBUG_PREFIX_MAP_pn-scp = "\
> - -fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
> - -fdebug-prefix-map=${STAGING_DIR_HOST}= \
> - -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
> -"
> -
> -# No configure
> -do_configure[noexec] = "1"
> -
> -EXTRA_OEMAKE = "${SCP_COMP_STR} \
> - 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}" ${EXTRA_OEMAKE}
> -}
> -do_compile[cleandirs] += "${B}"
> -
> -do_install() {
> - install -d ${D}/firmware
> - for FW in ${FW_TARGETS}; do
> - for TYPE in ramfw romfw; do
> - install -D "${B}/product/${SCP_PLATFORM}/${FW}_${TYPE}/release/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
> diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_git.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_git.bb
> index 9cb8b64..e9d8057 100644
> --- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_git.bb
> +++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_git.bb
> @@ -1,3 +1,4 @@
> +SUMMARY = "SCP and MCP Firmware"
> DESCRIPTION = "Firmware for SCP and MCP software reference implementation"
> HOMEPAGE = "https://github.com/ARM-software/SCP-firmware"
>
> @@ -17,4 +18,74 @@ SRCREV_scp = "fd7c83561a7d76c7681d5d017fb23aa3664c028c"
> SRCREV_cmsis = "refs/tags/5.2.0"
> SRCREV_FORMAT = "scp_cmsis"
>
> -require scp-firmware.inc
> +PROVIDES += "virtual/control-processor-firmware"
> +
> +SCP_BUILD_RELEASE ?= "1"
> +SCP_COMPILE_VERBOSE ?= "0"
> +SCP_PLATFORM ?= "invalid"
> +SCP_COMPILER ?= "arm-none-eabi"
> +SCP_LOG_LEVEL ?= "WARN"
> +
> +DEPENDS += "virtual/arm-none-eabi-gcc-native"
> +
> +SCP_BUILD_STR = "${@bb.utils.contains('SCP_BUILD_RELEASE', '1', 'release', 'debug', d)}"
> +SCP_COMP_STR = "${@bb.utils.contains('SCP_COMPILE_VERBOSE', '0', '', 'V=1', d)}"
> +
> +inherit python3native
> +inherit deploy
> +
> +B = "${WORKDIR}/build"
> +S = "${WORKDIR}/src"
> +
> +# Allow platform specific copying of only scp or both scp & mcp, default to both
> +FW_TARGETS ?= "scp mcp"
> +
> +COMPATIBLE_MACHINE ?= "invalid"
> +
> +LDFLAGS[unexport] = "1"
> +
> +# The gcc-arm-none-eabi version does not support -fmacro-prefix-max
> +DEBUG_PREFIX_MAP_pn-scp = "\
> + -fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
> + -fdebug-prefix-map=${STAGING_DIR_HOST}= \
> + -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
> +"
> +
> +# No configure
> +do_configure[noexec] = "1"
> +
> +EXTRA_OEMAKE = "${SCP_COMP_STR} \
> + 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}" ${EXTRA_OEMAKE}
> +}
> +do_compile[cleandirs] += "${B}"
> +
> +do_install() {
> + install -d ${D}/firmware
> + for FW in ${FW_TARGETS}; do
> + for TYPE in ramfw romfw; do
> + install -D "${B}/product/${SCP_PLATFORM}/${FW}_${TYPE}/release/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
> --
> 2.26.2
>
>
prev parent reply other threads:[~2020-07-30 19:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 10:11 [PATCH 1/9] arm/scp-firmware: merge bb/inc Ross Burton
2020-07-29 10:11 ` [PATCH 2/9] arm/scp-firmware: oe_runmake already passes EXTRA_OEMAKE Ross Burton
2020-07-29 10:11 ` [PATCH 3/9] arm/scp-firmware: always compile verbosely Ross Burton
2020-07-29 10:11 ` [PATCH 4/9] arm/scp-firmware: use gitsm fetcher Ross Burton
2020-07-30 8:37 ` Ross Burton
2020-07-29 10:11 ` [PATCH 5/9] arm-bsp/scp-firmware: remove cmsis SRCREV Ross Burton
2020-07-29 10:11 ` [PATCH 6/9] arm-bsp/scp-firmware: use wildcard bbappend Ross Burton
2020-07-29 10:11 ` [PATCH 7/9] arm/scp-firmware: move to 2.6.0 release tag Ross Burton
2020-07-30 19:54 ` [meta-arm] " Jon Mason
2020-07-29 10:11 ` [PATCH 8/9] arm-bsp/scp-firmware: use full version number 2.6.0, not 2.6 Ross Burton
2020-07-29 10:11 ` [PATCH 9/9] arm-bsp/scp-firmware: bump TC0 SRCREV and fix PV Ross Burton
2020-07-30 19:55 ` Jon Mason [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200730195531.GB15405@kudzu.us \
--to=jdmason@kudzu.us \
--cc=meta-arm@lists.yoctoproject.org \
--cc=ross@burtonini.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.