[PATCH 1/2] arm/trusted-firmware-a: put .elf output into trusted-firmware-a-dbg

[PATCH 1/2] arm/trusted-firmware-a: put .elf output into trusted-firmware-a-dbg

[Ross Burton]

The .elf output files are for debugging purposes, so put them into the
-dbg package to make this clear.

Change-Id: I5d70b2421b06eed0483f8ef508cf535ec70abc63
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
index 807e125..67a5cd3 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
@@ -223,8 +223,10 @@ do_install() {
 
 FILES_${PN} = "/firmware"
 SYSROOT_DIRS += "/firmware"
+
+FILES_${PN}-dbg = "/firmware/*.elf"
 # Skip QA check for relocations in .text of elf binaries
-INSANE_SKIP_${PN} = "textrel"
+INSANE_SKIP_${PN}-dbg = "textrel"
 
 do_deploy() {
     cp -rf ${D}/firmware/* ${DEPLOYDIR}/
-- 
2.25.1

[PATCH 2/2] arm/scp-firmware: install .elf into scp-firmware-dbg

[Ross Burton]

Alongside the .bin files, also install the .elf files for debugging and
package them into scp-firmware-dbg.

The architecture QA test needs to be skipped as the SCP can be 32-bit
Arm when the main processor is 64-bit.

Change-Id: I82a57d6cc80f7d7e20028cced83481322803fc13
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.8.0.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.8.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.8.0.bb
index bee3ab5..c58e621 100644
--- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.8.0.bb
+++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.8.0.bb
@@ -59,14 +59,19 @@ do_install() {
      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/"
+           install -D "${B}/product/${SCP_PLATFORM}/${FW}_${TYPE}/${SCP_BUILD_STR}/bin/${FW}_${TYPE}.elf" "${D}/firmware/"
         done
      done
 }
 
 FILES_${PN} = "/firmware"
 SYSROOT_DIRS += "/firmware"
+
+FILES_${PN}-dbg += "/firmware/*.elf"
 # Skip QA check for relocations in .text of elf binaries
-INSANE_SKIP_${PN} = "textrel"
+INSANE_SKIP_${PN}-dbg = "arch textrel"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
 
 do_deploy() {
     # Copy the images to deploy directory
-- 
2.25.1