diff mbox series

[1/2,langdale] arm/scp-firmware: Ensure CMAKE_BUILD_TYPE is capitalized

Message ID 20230111175929.1446440-1-peter.hoyes@arm.com
State New
Headers show
Series [1/2,langdale] arm/scp-firmware: Ensure CMAKE_BUILD_TYPE is capitalized | expand

Commit Message

Peter Hoyes Jan. 11, 2023, 5:59 p.m. UTC 
From: Peter Hoyes <Peter.Hoyes@arm.com>

If CMAKE_BUILD_TYPE=debug (lowercase), SCP-firmware builds with debug
compiler flags but BUILD_MODE_DEBUG is not defined in C code so features
that are conditionally enabled/disabled in debug mode are not active.

Pass capitalized "Debug" and "Release" strings to CMAKE_BUILD_TYPE to
ensure Debug mode is fully enabled when SCP_BUILD_RELEASE = "0".

SCP_BUILD_RELEASE = "1" (the default) for all machines in meta-arm-bsp
so they are unaffected.

Issue-Id: SCM-5864
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Change-Id: I93220420eedd2e3e6c169679efcaf4642dd5bc51
---
 meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jon Mason Jan. 13, 2023, 6:05 p.m. UTC | #1 
On Wed, 11 Jan 2023 17:59:28 +0000, Peter Hoyes wrote:
> If CMAKE_BUILD_TYPE=debug (lowercase), SCP-firmware builds with debug
> compiler flags but BUILD_MODE_DEBUG is not defined in C code so features
> that are conditionally enabled/disabled in debug mode are not active.
> 
> Pass capitalized "Debug" and "Release" strings to CMAKE_BUILD_TYPE to
> ensure Debug mode is fully enabled when SCP_BUILD_RELEASE = "0".
> 
> [...]

Applied, thanks!

[1/2] arm/scp-firmware: Ensure CMAKE_BUILD_TYPE is capitalized
      commit: b5fe2bf2b7295d258e781934b27f99e32ceee774
[2/2] arm/scp-firmware: Disable cppcheck
      commit: fd414c303c1cc9b2fa47001ab555c5e22ee1c5a4

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb
index 4828fb55..5dbbff94 100644
--- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb
+++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb
@@ -27,7 +27,7 @@  DEPENDS = "virtual/arm-none-eabi-gcc-native \
 # For now we only build with GCC, so stop meta-clang trying to get involved
 TOOLCHAIN = "gcc"
 
-SCP_BUILD_STR = "${@bb.utils.contains('SCP_BUILD_RELEASE', '1', 'release', 'debug', d)}"
+SCP_BUILD_STR = "${@bb.utils.contains('SCP_BUILD_RELEASE', '1', 'Release', 'Debug', d)}"
 
 inherit deploy