build.sh: get the variant name from the Zephyr build system

Get the variant name (NORMALIZED_BOARD_TARGET) from the Zephyr build
system as early as possible. This allows to have per-target build
directories.

Note that a bug with the shield specifiers does not currently allow to
reuse the same build directory multiple times.

Remove inline comments from macro definitions in include files.

Author: pillo79

Diff for: boards.txt

@@ -12,19 +12,17 @@ giga.menu.debug.true=Debug
 giga.menu.debug.false.postbuild_debug=
 giga.menu.debug.true.postbuild_debug=-debug
 
-giga.build.variant=arduino_giga_r1_m7
+giga.build.variant=arduino_giga_r1_stm32h747xx_m7
 giga.build.mcu=cortex-m7
 giga.build.fpu=-mfpu=fpv5-d16
 giga.build.architecture=cortex-m7
 giga.compiler.zephyr.arch.define=-DCORE_CM7
 
-giga.build.board={build.variant}
-
 giga.build.float-abi=-mfloat-abi=softfp
 giga.build.extra_flags=
 giga.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
 giga.build.architecture=cortex-m7
-giga.build.board=GIGA
+giga.build.board=ARDUINO_GIGA
 giga.compiler.zephyr=
 giga.vid.0=0x2341
 giga.pid.0=0x0066
@@ -54,7 +52,7 @@ giga.bootloader.tool.default=dfu-util
 giga.bootloader.vid=0x2341
 giga.bootloader.pid=0x0366
 giga.bootloader.interface=0
-giga.bootloader.file=zephyr-arduino_giga_r1_m7.bin
+giga.bootloader.file=zephyr-{build.variant}.bin
 giga.bootloader.address=0x08040000
 
 giga.debug.tool=gdb
@@ -77,14 +75,12 @@ nano33ble.menu.debug.true=Debug
 nano33ble.menu.debug.false.postbuild_debug=
 nano33ble.menu.debug.true.postbuild_debug=-debug
 
-nano33ble.build.variant=arduino_nano_33_ble_sense
+nano33ble.build.variant=arduino_nano_33_ble_nrf52840_sense
 nano33ble.build.mcu=cortex-m4
 nano33ble.build.fpu=-mfpu=fpv4-sp-d16
 nano33ble.build.architecture=cortex-m4
 nano33ble.compiler.zephyr.arch.define=
 
-nano33ble.build.board={build.variant}
-
 nano33ble.build.float-abi=-mfloat-abi=hard
 nano33ble.build.extra_flags=
 nano33ble.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
@@ -118,7 +114,7 @@ nano33ble.bootloader.tool.default=bossac
 nano33ble.bootloader.vid=0x2341
 nano33ble.bootloader.pid=0x035b
 nano33ble.bootloader.interface=0
-nano33ble.bootloader.file=zephyr-arduino_nano_33_ble_sense.bin
+nano33ble.bootloader.file=zephyr-{build.variant}.bin
 nano33ble.bootloader.address=0x0000
 
 nano33ble.debug.tool=gdb
@@ -140,19 +136,17 @@ ek_ra8d1.menu.debug.true=Debug
 ek_ra8d1.menu.debug.false.postbuild_debug=
 ek_ra8d1.menu.debug.true.postbuild_debug=-debug
 
-ek_ra8d1.build.variant=ek_ra8d1
+ek_ra8d1.build.variant=ek_ra8d1_r7fa8d1bhecbd
 ek_ra8d1.build.mcu=cortex-m85+nomve
 ek_ra8d1.build.fpu=-mfpu=fpv5-d16
 ek_ra8d1.build.architecture=cortex-m85+nomve
 ek_ra8d1.compiler.zephyr.arch.define=
 
-ek_ra8d1.build.board={build.variant}
-
 ek_ra8d1.build.float-abi=-mfloat-abi=hard
 ek_ra8d1.build.extra_flags=
 ek_ra8d1.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
 ek_ra8d1.build.architecture=cortex-m85+nomve
-ek_ra8d1.build.board=ek_ra8d1
+ek_ra8d1.build.board=EK_RA8D1
 ek_ra8d1.compiler.zephyr.arch.define=
 
 #ek_ra8d1.recipe.hooks.objcopy.postobjcopy.4.pattern=cp {build.variant.path}/flasher.jlink "{build.path}/flasher.jlink"
@@ -181,7 +175,7 @@ ek_ra8d1.upload.target=R7FA8D1AH
 
 ek_ra8d1.bootloader.tool=pyocd
 ek_ra8d1.bootloader.tool.default=pyocd
-ek_ra8d1.bootloader.file=zephyr-ek_ra8d1.elf
+ek_ra8d1.bootloader.file=zephyr-{build.variant}.elf
 ek_ra8d1.bootloader.target=R7FA8D1AH
 
 
@@ -204,12 +198,10 @@ frdm_mcxn947.build.fpu=-mfpu=fpv5-sp-d16
 frdm_mcxn947.build.architecture=cortex-m33
 frdm_mcxn947.compiler.zephyr.arch.define=
 
-frdm_mcxn947.build.board={build.variant}
-
 frdm_mcxn947.build.float-abi=-mfloat-abi=hard
 frdm_mcxn947.build.extra_flags=
 frdm_mcxn947.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
-frdm_mcxn947.build.board=frdm_mcxn947
+frdm_mcxn947.build.board=FRDM_MCXN947
 frdm_mcxn947.compiler.zephyr.arch.define=
 frdm_mcxn947.compiler.zephyr=
 frdm_mcxn947.vid.0=0x1fc9
@@ -234,7 +226,7 @@ frdm_mcxn947.upload.maximum_data_size=523624
 
 frdm_mcxn947.bootloader.tool=pyocd
 frdm_mcxn947.bootloader.tool.default=pyocd
-frdm_mcxn947.bootloader.file=zephyr-frdm_mcxn947_mcxn947_cpu0.elf
+frdm_mcxn947.bootloader.file=zephyr-{build.variant}.elf
 frdm_mcxn947.bootloader.target=mcxn947vdf
 
 
@@ -251,19 +243,17 @@ portentah7.menu.debug.true=Debug
 portentah7.menu.debug.false.postbuild_debug=
 portentah7.menu.debug.true.postbuild_debug=-debug
 
-portentah7.build.variant=arduino_portenta_h7
+portentah7.build.variant=arduino_portenta_h7_stm32h747xx_m7
 portentah7.build.mcu=cortex-m7
 portentah7.build.fpu=-mfpu=fpv5-d16
 portentah7.build.architecture=cortex-m7
 portentah7.compiler.zephyr.arch.define=-DCORE_CM7
 
-portentah7.build.board={build.variant}
-
 portentah7.build.float-abi=-mfloat-abi=softfp
 portentah7.build.extra_flags=
 portentah7.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
 portentah7.build.architecture=cortex-m7
-portentah7.build.board=PORTENTA_H7
+portentah7.build.board=ARDUINO_PORTENTA_H7
 portentah7.compiler.zephyr=
 portentah7.vid.0=0x2341
 portentah7.pid.0=0x005b
@@ -293,7 +283,7 @@ portentah7.bootloader.tool.default=dfu-util
 portentah7.bootloader.vid=0x2341
 portentah7.bootloader.pid=0x035b
 portentah7.bootloader.interface=0
-portentah7.bootloader.file=zephyr-arduino_portenta_h7.bin
+portentah7.bootloader.file=zephyr-{build.variant}.bin
 portentah7.bootloader.address=0x08040000
 
 portentah7.debug.tool=gdb
@@ -316,18 +306,16 @@ frdm_rw612.menu.debug.true=Debug
 frdm_rw612.menu.debug.false.postbuild_debug=
 frdm_rw612.menu.debug.true.postbuild_debug=-debug
 
-frdm_rw612.build.variant=frdm_rw612
+frdm_rw612.build.variant=frdm_rw612_rw612
 frdm_rw612.build.mcu=cortex-m33+nodsp
 frdm_rw612.build.fpu=-mfpu=fpv5-sp-d16
 frdm_rw612.build.architecture=cortex-m33+nodsp
 frdm_rw612.compiler.zephyr.arch.define=
 
-frdm_rw612.build.board={build.variant}
-
 frdm_rw612.build.float-abi=-mfloat-abi=hard
 frdm_rw612.build.extra_flags=
 frdm_rw612.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
-frdm_rw612.build.board=frdm_rw612
+frdm_rw612.build.board=FRDM_RW612
 frdm_rw612.compiler.zephyr.arch.define=
 frdm_rw612.compiler.zephyr=
 frdm_rw612.vid.0=0x1fc9
@@ -352,7 +340,7 @@ frdm_rw612.upload.maximum_data_size=523624
 
 frdm_rw612.bootloader.tool=pyocd
 frdm_rw612.bootloader.tool.default=pyocd
-frdm_rw612.bootloader.file=zephyr-frdm_rw612.elf
+frdm_rw612.bootloader.file=zephyr-{build.variant}.elf
 frdm_rw612.bootloader.target=rw612
 
 ##########################################################################################
@@ -368,14 +356,12 @@ niclasense.menu.debug.true=Debug
 niclasense.menu.debug.false.postbuild_debug=
 niclasense.menu.debug.true.postbuild_debug=-debug
 
-niclasense.build.variant=arduino_nicla_sense_me
+niclasense.build.variant=arduino_nicla_sense_me_nrf52832
 niclasense.build.mcu=cortex-m4
 niclasense.build.fpu=-mfpu=fpv4-sp-d16
 niclasense.build.architecture=cortex-m4
 niclasense.compiler.zephyr.arch.define=
 
-niclasense.build.board={build.variant}
-
 niclasense.build.float-abi=-mfloat-abi=hard
 niclasense.build.extra_flags=
 niclasense.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
@@ -414,7 +400,7 @@ niclasense.bootloader.tool.default=pyocd
 niclasense.bootloader.vid=0x2341
 niclasense.bootloader.pid=0x0360
 niclasense.bootloader.interface=0
-niclasense.bootloader.file=zephyr-arduino_nicla_sense_me.hex
+niclasense.bootloader.file=zephyr-{build.variant}.hex
 niclasense.bootloader.target=nrf52
 
 niclasense.debug.tool=gdb
@@ -447,18 +433,16 @@ portentac33.menu.mode.linked.build.ldscript={runtime.platform.path}/variants/lin
 portentac33.menu.mode.linked.upload.extension=bin-zsk.bin
 portentac33.menu.mode.linked.postbuild_mode=-linked
 
-portentac33.build.variant=arduino_portenta_c33
+portentac33.build.variant=arduino_portenta_c33_r7fa6m5bh3cfc
 portentac33.build.mcu=cortex-m33
 portentac33.build.fpu=-mfpu=fpv5-sp-d16
 portentac33.build.architecture=cortex-m33
 portentac33.compiler.zephyr.arch.define=
 
-portentac33.build.board={build.variant}
-
 portentac33.build.float-abi=-mfloat-abi=hard
 portentac33.build.extra_flags=
 portentac33.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
-portentac33.build.board=arduino_portenta_c33
+portentac33.build.board=ARDUINO_PORTENTA_C33
 portentac33.compiler.zephyr.arch.define=
 portentac33.compiler.zephyr=
 portentac33.vid.0=0x2341
@@ -484,7 +468,7 @@ portentac33.upload.dfuse=-Q
 
 portentac33.bootloader.tool=dfu-util
 portentac33.bootloader.tool.default=dfu-util
-portentac33.bootloader.file=zephyr-arduino_portenta_c33.bin
+portentac33.bootloader.file=zephyr-{build.variant}.bin
 portentac33.bootloader.interface=0
 portentac33.bootloader.address=0x10000
 portentac33.bootloader.dfuse=-Q

Diff for: extra/build.sh

@@ -12,48 +12,73 @@ if [ x$ZEPHYR_SDK_INSTALL_DIR == x"" ]; then
 	export ZEPHYR_SDK_INSTALL_DIR=${SDK_PATH}
 fi
 
-board=$1
-variant=$2
-third_arg=$3
-extra_args=""
-
 if [[ $# -eq 0 ]]; then
-board=arduino_giga_r1//m7
-variant=arduino_giga_r1_m7
+    board=arduino_giga_r1//m7
+else
+    board=$1
+    shift
 fi
 
 source venv/bin/activate
 
-if [ "$third_arg" != "" ]; then
-    extra_args="--shield $third_arg"
-fi
+ZEPHYR_BASE=$(west topdir)/zephyr
 
-(west build loader -b $board -p $extra_args && west build -t llext-edk)
-(rm -rf variants/$variant/* && tar xfp build/zephyr/llext-edk.tar.xz --directory variants/$variant/)
+# Get the variant name (NORMALIZED_BOARD_TARGET in Zephyr)
+tmpdir=$(mktemp -d)
+variant=$(cmake -DBOARD=$board -P extra/get_variant_name.cmake | grep 'VARIANT=' | cut -d '=' -f 2)
+rm -rf ${tmpdir}
 
-(cp build/zephyr/zephyr.elf firmwares/zephyr-$variant.elf)
-if [ -f build/zephyr/zephyr.bin ]; then
-    cp build/zephyr/zephyr.bin firmwares/zephyr-$variant.bin
-elif [ -f build/zephyr/zephyr.hex ]; then
-    cp build/zephyr/zephyr.hex firmwares/zephyr-$variant.hex
+if [ -z "${variant}" ] ; then
+	echo "Failed to get variant name from '$board'"
+	exit 1
 fi
 
+echo && echo && echo
+echo ${variant}
+echo ${variant} | sed -e 's/./=/g'
+echo
+
+# Build the loader
+BUILD_DIR=build/${variant}
+VARIANT_DIR=variants/${variant}
+rm -rf ${BUILD_DIR}
+west build -d ${BUILD_DIR} -b ${board} loader -t llext-edk $*
+
+# Extract the generated EDK tarball and copy it to the variant directory
+mkdir -p ${VARIANT_DIR} firmwares
+(set -e ; cd ${BUILD_DIR} && rm -rf llext-edk && tar xf zephyr/llext-edk.tar.Z)
+rsync -a --delete ${BUILD_DIR}/llext-edk ${VARIANT_DIR}/
+
+# remove all inline comments in macro definitions
+# (especially from devicetree_generated.h and sys/util_internal.h)
+line_preproc_ok='^\s*#\s*(if|else|elif|endif)' # match conditional preproc lines
+line_comment_only='^\s*\/\*' # match lines starting with comment
+line_continuation='\\$' # match lines ending with '\'
+c_comment='\s*\/\*.*?\*\/' # match C-style comments and any preceding space
+perl -i -pe "s/${c_comment}//gs unless /${line_preproc_ok}/ || (/${line_comment_only}/ && !/${line_continuation}/)" $(find ${VARIANT_DIR}/llext-edk/include/ -type f)
+for ext in elf bin hex; do
+    rm -f firmwares/zephyr-$variant.$ext
+    if [ -f ${BUILD_DIR}/zephyr/zephyr.$ext ]; then
+        cp ${BUILD_DIR}/zephyr/zephyr.$ext firmwares/zephyr-$variant.$ext
+    fi
+done
+
 # Generate the provides.ld file for linked builds
 echo "Exporting provides.ld"
 READELF=${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin/arm-zephyr-eabi-readelf
-$READELF --wide -s build/zephyr/zephyr.elf  | c++filt  | grep FUNC | awk -F' ' '{print "PROVIDE("$8" = 0x"$2");"}' > variants/$variant/provides.ld
-$READELF --wide -s build/zephyr/zephyr.elf  | c++filt  | grep kheap_llext_heap | awk -F' ' '{print "PROVIDE("$8" = 0x"$2");"}' >> variants/$variant/provides.ld
-$READELF --wide -s build/zephyr/zephyr.elf  | c++filt  | grep kheap_llext_heap | awk -F' ' '{print "PROVIDE(kheap_llext_heap_size = "$3");"}' >> variants/$variant/provides.ld
-$READELF --wide -s build/zephyr/zephyr.elf  | c++filt  | grep kheap__system_heap | awk -F' ' '{print "PROVIDE("$8" = 0x"$2");"}' >> variants/$variant/provides.ld
-$READELF --wide -s build/zephyr/zephyr.elf  | c++filt  | grep kheap__system_heap | awk -F' ' '{print "PROVIDE(kheap__system_heap_size = "$3");"}' >> variants/$variant/provides.ld
-cat build/zephyr/zephyr.map | grep __device_dts_ord | grep -v rodata | grep -v llext_const_symbol |  awk -F' ' '{print "PROVIDE("$2" = "$1");"}'  >> variants/$variant/provides.ld
-TEXT_START=`cat loader/boards/$variant.overlay | grep user_sketch: | cut -f2 -d"@" | cut -f1 -d"{"`
-echo "PROVIDE(_sketch_start = 0x$TEXT_START);" >> variants/$variant/provides.ld
-
-sed -i 's/PROVIDE(malloc =/PROVIDE(__wrap_malloc =/g' variants/$variant/provides.ld
-sed -i 's/PROVIDE(free =/PROVIDE(__wrap_free =/g' variants/$variant/provides.ld
-sed -i 's/PROVIDE(realloc =/PROVIDE(__wrap_realloc =/g' variants/$variant/provides.ld
-sed -i 's/PROVIDE(calloc =/PROVIDE(__wrap_calloc =/g' variants/$variant/provides.ld
-sed -i 's/PROVIDE(random =/PROVIDE(__wrap_random =/g' variants/$variant/provides.ld
+$READELF --wide -s ${BUILD_DIR}/zephyr/zephyr.elf  | c++filt  | grep FUNC | awk -F' ' '{print "PROVIDE("$8" = 0x"$2");"}' > ${VARIANT_DIR}/provides.ld
+$READELF --wide -s ${BUILD_DIR}/zephyr/zephyr.elf  | c++filt  | grep kheap_llext_heap | awk -F' ' '{print "PROVIDE("$8" = 0x"$2");"}' >> ${VARIANT_DIR}/provides.ld
+$READELF --wide -s ${BUILD_DIR}/zephyr/zephyr.elf  | c++filt  | grep kheap_llext_heap | awk -F' ' '{print "PROVIDE(kheap_llext_heap_size = "$3");"}' >> ${VARIANT_DIR}/provides.ld
+$READELF --wide -s ${BUILD_DIR}/zephyr/zephyr.elf  | c++filt  | grep kheap__system_heap | awk -F' ' '{print "PROVIDE("$8" = 0x"$2");"}' >> ${VARIANT_DIR}/provides.ld
+$READELF --wide -s ${BUILD_DIR}/zephyr/zephyr.elf  | c++filt  | grep kheap__system_heap | awk -F' ' '{print "PROVIDE(kheap__system_heap_size = "$3");"}' >> ${VARIANT_DIR}/provides.ld
+cat ${BUILD_DIR}/zephyr/zephyr.map | grep __device_dts_ord | grep -v rodata | grep -v llext_const_symbol |  awk -F' ' '{print "PROVIDE("$2" = "$1");"}'  >> ${VARIANT_DIR}/provides.ld
+TEXT_START=`cat variants/$variant/$variant.overlay | grep user_sketch: | cut -f2 -d"@" | cut -f1 -d"{"`
+echo "PROVIDE(_sketch_start = 0x$TEXT_START);" >> ${VARIANT_DIR}/provides.ld
+
+sed -i 's/PROVIDE(malloc =/PROVIDE(__wrap_malloc =/g' ${VARIANT_DIR}/provides.ld
+sed -i 's/PROVIDE(free =/PROVIDE(__wrap_free =/g' ${VARIANT_DIR}/provides.ld
+sed -i 's/PROVIDE(realloc =/PROVIDE(__wrap_realloc =/g' ${VARIANT_DIR}/provides.ld
+sed -i 's/PROVIDE(calloc =/PROVIDE(__wrap_calloc =/g' ${VARIANT_DIR}/provides.ld
+sed -i 's/PROVIDE(random =/PROVIDE(__wrap_random =/g' ${VARIANT_DIR}/provides.ld
 
 cmake -P extra/gen_arduino_files.cmake $variant

Diff for: extra/build_all.sh

@@ -2,10 +2,11 @@
 
 set -e
 
-./extra/build.sh arduino_giga_r1//m7 arduino_giga_r1_m7 giga_display_shield
-./extra/build.sh arduino_nano_33_ble//sense arduino_nano_33_ble_sense
-./extra/build.sh arduino_portenta_h7//m7 arduino_portenta_h7
-./extra/build.sh ek_ra8d1 ek_ra8d1
-./extra/build.sh frdm_mcxn947/mcxn947/cpu0 frdm_mcxn947_mcxn947_cpu0
-./extra/build.sh frdm_rw612 frdm_rw612
-./extra/build.sh arduino_portenta_c33 arduino_portenta_c33
+./extra/build.sh arduino_giga_r1//m7 --shield giga_display_shield
+./extra/build.sh arduino_nano_33_ble//sense
+./extra/build.sh arduino_nicla_sense_me
+./extra/build.sh arduino_portenta_c33
+./extra/build.sh arduino_portenta_h7//m7
+./extra/build.sh ek_ra8d1
+./extra/build.sh frdm_mcxn947/mcxn947/cpu0
+./extra/build.sh frdm_rw612

Diff for: extra/get_variant_name.cmake

@@ -0,0 +1,11 @@
+# Copyright (C) 2025 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+#
+# Generate NORMALIZED_BOARD_TARGET from BOARD via the Zephyr build system
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+message(STATUS "VARIANT=${NORMALIZED_BOARD_TARGET}")

Diff for: extra/post_build_tool/zephyr-post-build-tool

@@ -4,6 +4,12 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+# get value of NORMALIZED_BOARD_TARGET early
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+
+set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
+set(EXTRA_CONF_FILE ${CMAKE_CURRENT_LIST_DIR}/../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.conf)
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(app LANGUAGES C CXX)
@@ -13,4 +19,4 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/blobs)
 FILE(GLOB app_sources *.c)
 target_sources(app PRIVATE ${app_sources})
 
-target_link_libraries(app PUBLIC blobs)
+target_link_libraries(app PUBLIC blobs)

Diff for: firmwares/zephyr-arduino_giga_r1_m7.bin renamed to firmwares/zephyr-arduino_giga_r1_stm32h747xx_m7.bin

@@ -25,6 +25,9 @@ CONFIG_LLEXT_SHELL=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPORT_DEVICES=y
 
+CONFIG_LLEXT_EDK=y
+CONFIG_LLEXT_EDK_FORMAT_TAR_ZSTD=y
+
 CONFIG_GPIO=y
 CONFIG_PINCTRL=y
 CONFIG_I2C=y