Merge branch 'arduino:arduino' into llext_heap-fix-for-NANO33

Author: mjs513

Diff for: .github/workflows/package_core.yml

@@ -35,7 +35,7 @@ jobs:
           ./extra/bootstrap.sh -o=--filter=tree:0
           echo "CORE_TAG=$(git describe --always)" >> "$GITHUB_ENV"
           echo "CORE_ARTIFACT=ArduinoCore-zephyr-$(git describe --always)" >> "$GITHUB_ENV"
-          echo "BOARD_VARIANTS=[ $(cat boards.txt | grep '^[^#]*\.build\.variant' | sed -e 's/^\([^#]*\)\.build\.variant=\(.*\)/{ \"variant\": \"\2\", \"board\": \"\1\" },/' | sort | tr '\r\n' ' ' | sed -e 's/,\s*$//') ]" >> "$GITHUB_ENV"
+          echo "BOARD_VARIANTS=$(extra/get_board_details.sh | jq -cr 'sort_by(.variant)')" >> "$GITHUB_ENV"
 
       - name: ccache
         uses: hendrikmuhs/[email protected]
@@ -50,7 +50,6 @@ jobs:
       - name: Package
         run: |
           ./extra/package.sh ${{ env.CORE_TAG }}
-          mv ../${{ env.CORE_ARTIFACT }}.tar.bz2 .
 
       - name: Archive core
         uses: actions/upload-artifact@v4
@@ -221,6 +220,7 @@ jobs:
     if: ${{ github.event_name == 'push' && github.repository == 'arduino/ArduinoCore-zephyr' }}
     needs:
       - package-core
+      - test-core
       - publish-core
     env:
       CORE_ARTIFACT: ${{ needs.package-core.outputs.CORE_ARTIFACT }}

Diff for: .gitignore

@@ -1,3 +1,4 @@
 extra/post_build_tool/distrib/
 build/
 venv/
+ArduinoCore-zephyr-*.tar.bz2

Diff for: boards.txt

@@ -12,6 +12,8 @@ giga.menu.debug.true=Debug
 giga.menu.debug.false.postbuild_debug=
 giga.menu.debug.true.postbuild_debug=-debug
 
+giga.build.zephyr_target=arduino_giga_r1//m7
+giga.build.zephyr_args=--shield giga_display_shield
 giga.build.variant=arduino_giga_r1_stm32h747xx_m7
 giga.build.mcu=cortex-m7
 giga.build.fpu=-mfpu=fpv5-d16
@@ -75,6 +77,8 @@ nano33ble.menu.debug.true=Debug
 nano33ble.menu.debug.false.postbuild_debug=
 nano33ble.menu.debug.true.postbuild_debug=-debug
 
+nano33ble.build.zephyr_target=arduino_nano_33_ble//sense
+nano33ble.build.zephyr_args=
 nano33ble.build.variant=arduino_nano_33_ble_nrf52840_sense
 nano33ble.build.mcu=cortex-m4
 nano33ble.build.fpu=-mfpu=fpv4-sp-d16
@@ -136,6 +140,8 @@ ek_ra8d1.menu.debug.true=Debug
 ek_ra8d1.menu.debug.false.postbuild_debug=
 ek_ra8d1.menu.debug.true.postbuild_debug=-debug
 
+ek_ra8d1.build.zephyr_target=ek_ra8d1
+ek_ra8d1.build.zephyr_args=
 ek_ra8d1.build.variant=ek_ra8d1_r7fa8d1bhecbd
 ek_ra8d1.build.mcu=cortex-m85+nomve
 ek_ra8d1.build.fpu=-mfpu=fpv5-d16
@@ -192,6 +198,8 @@ frdm_mcxn947.menu.debug.true=Debug
 frdm_mcxn947.menu.debug.false.postbuild_debug=
 frdm_mcxn947.menu.debug.true.postbuild_debug=-debug
 
+frdm_mcxn947.build.zephyr_target=frdm_mcxn947//cpu0
+frdm_mcxn947.build.zephyr_args=
 frdm_mcxn947.build.variant=frdm_mcxn947_mcxn947_cpu0
 frdm_mcxn947.build.mcu=cortex-m33
 frdm_mcxn947.build.fpu=-mfpu=fpv5-sp-d16
@@ -243,6 +251,8 @@ portentah7.menu.debug.true=Debug
 portentah7.menu.debug.false.postbuild_debug=
 portentah7.menu.debug.true.postbuild_debug=-debug
 
+[email protected]//m7
+portentah7.build.zephyr_args=
 portentah7.build.variant=arduino_portenta_h7_stm32h747xx_m7
 portentah7.build.mcu=cortex-m7
 portentah7.build.fpu=-mfpu=fpv5-d16
@@ -306,6 +316,8 @@ frdm_rw612.menu.debug.true=Debug
 frdm_rw612.menu.debug.false.postbuild_debug=
 frdm_rw612.menu.debug.true.postbuild_debug=-debug
 
+frdm_rw612.build.zephyr_target=frdm_rw612
+frdm_rw612.build.zephyr_args=
 frdm_rw612.build.variant=frdm_rw612_rw612
 frdm_rw612.build.mcu=cortex-m33+nodsp
 frdm_rw612.build.fpu=-mfpu=fpv5-sp-d16
@@ -356,6 +368,8 @@ niclasense.menu.debug.true=Debug
 niclasense.menu.debug.false.postbuild_debug=
 niclasense.menu.debug.true.postbuild_debug=-debug
 
+niclasense.build.zephyr_target=arduino_nicla_sense_me
+niclasense.build.zephyr_args=
 niclasense.build.variant=arduino_nicla_sense_me_nrf52832
 niclasense.build.mcu=cortex-m4
 niclasense.build.fpu=-mfpu=fpv4-sp-d16
@@ -429,10 +443,12 @@ portentac33.menu.mode.linked=linked
 portentac33.menu.mode.linked.build.extra_ldflags=-lc -lm -lgcc -L{build.variant.path} -Wl,--wrap=random -Wl,--wrap=calloc -Wl,--wrap=free -Wl,--wrap=malloc -Wl,--wrap=realloc 
 portentac33.menu.mode.linked.build.llext_link_flags=
 portentac33.menu.mode.linked.build.suffix=_linked
-portentac33.menu.mode.linked.build.ldscript={runtime.platform.path}/variants/linked/linker_script.ld
+portentac33.menu.mode.linked.build.ldscript={runtime.platform.path}/variants/_linked/linker_script.ld
 portentac33.menu.mode.linked.upload.extension=bin-zsk.bin
 portentac33.menu.mode.linked.postbuild_mode=-prelinked
 
+portentac33.build.zephyr_target=arduino_portenta_c33
+portentac33.build.zephyr_args=
 portentac33.build.variant=arduino_portenta_c33_r7fa6m5bh3cfc
 portentac33.build.mcu=cortex-m33
 portentac33.build.fpu=-mfpu=fpv5-sp-d16

Diff for: extra/build.sh

@@ -13,30 +13,32 @@ if [ x$ZEPHYR_SDK_INSTALL_DIR == x"" ]; then
 fi
 
 if [[ $# -eq 0 ]]; then
-	board=$(jq -cr '.[0].board' < ./extra/targets.json)
-	args=$(jq -cr '.[0].args' < ./extra/targets.json)
+	first_board=$(extra/get_board_details.sh | jq -cr '.[0]')
+	target=$(jq -cr '.target' <<< "$first_board")
+	args=$(jq -cr '.args' <<< "$first_board")
 else
-	board=$1
+	target=$1
 	shift
+	args="$*"
 fi
 
 source venv/bin/activate
 
 ZEPHYR_BASE=$(west topdir)/zephyr
 
 # Get the variant name (NORMALIZED_BOARD_TARGET in Zephyr)
-variant=$(extra/get_variant_name.sh $board)
+variant=$(extra/get_variant_name.sh $target)
 
 if [ -z "${variant}" ] ; then
-	echo "Failed to get variant name from '$board'"
+	echo "Failed to get variant name from '$target'"
 	exit 1
 fi
 
 # 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 $*
+west build -d ${BUILD_DIR} -b ${target} loader -t llext-edk ${args}
 
 # Extract the generated EDK tarball and copy it to the variant directory
 mkdir -p ${VARIANT_DIR} firmwares

Diff for: extra/build_all.sh

@@ -24,20 +24,21 @@ if [ ! -z "$GITHUB_STEP_SUMMARY" ] ; then
 	echo "### Variant build results:" >> "$GITHUB_STEP_SUMMARY"
 fi
 
-jq -cr '.[]' < ./extra/targets.json | while read -r item; do
-	board=$(jq -cr '.board // ""' <<< "$item")
+extra/get_board_details.sh | jq -cr 'sort_by(.variant) | .[]' | while read -r item; do
+	board=$(jq -cr '.board' <<< "$item")
+	variant=$(jq -cr '.variant' <<< "$item")
+	target=$(jq -cr '.target' <<< "$item")
 	args=$(jq -cr '.args // ""' <<< "$item")
 
-	variant=$(extra/get_variant_name.sh "$board" || echo "$board")
 	if [ -z "$GITHUB_STEP_SUMMARY" ] ; then
 		echo && echo
-		echo ${variant}
-		echo ${variant} | sed -e 's/./=/g'
+		echo "${board} (${variant})"
+		echo "${board} (${variant})" | sed -e 's/./=/g'
 	else
-		echo "::group::=== ${variant} ==="
+		echo "::group::=== ${board} (${variant}) ==="
 	fi
 
-	./extra/build.sh "$board" $args
+	./extra/build.sh "$target" $args
 	result=$?
 
 	if [ -z "$GITHUB_STEP_SUMMARY" ] ; then

Diff for: extra/get_board_details.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+get_boards() {
+	cat boards.txt | sed -e 's/#.*//' | grep -E '^.*\.build\.variant=' | sed -e 's/\.build\.variant=.*//'
+}
+
+get_board_field() {
+	board=$1
+	field=$2
+	cat boards.txt | sed -e 's/#.*//' | grep -E "^$board\\.build\\.$field=" | cut -d '=' -f2- | sed -e 's/"/\"/g'
+}
+
+for BOARD in $(get_boards); do
+	VARIANT=$(get_board_field $BOARD "variant")
+	TARGET=$(get_board_field $BOARD "zephyr_target")
+	ARGS=$(get_board_field $BOARD "zephyr_args")
+
+	if [ -z "$TARGET" ] ; then
+		echo "error: missing '$BOARD.build.zephyr_target'" 1>&2
+		exit 1
+	fi
+
+	echo "{ \"board\": \"$BOARD\", \"variant\": \"$VARIANT\", \"target\": \"$TARGET\", \"args\": \"$ARGS\" }"
+done | jq -crs .

Diff for: extra/package.lst

@@ -0,0 +1,17 @@
+# This file contains all the *static* files and directories that will be added
+# to any core package archive.
+#
+# NOTE: board-specific entries in the 'firmwares/' and 'variants/' directories
+#       are automatically added by package.sh depending on the information in
+#       'boards.txt', so they should not be included here.
+
+boards.txt
+platform.txt
+programmers.txt
+LICENSE
+README.md
+doc/
+cores/
+libraries/
+variants/_llext/
+variants/_linked/

Diff for: extra/package.sh

@@ -1,13 +1,31 @@
 #!/bin/bash
 
-if [ ! -f platform.txt ]; then
-  echo Launch this script from the root core folder as ./extras/package.sh VERSION
-  exit 2
+set -e
+
+if [ -z "$1" ]; then
+	echo "Usage: $0 VERSION"
+	exit 1
 fi
 
-FOLDER=`basename $PWD`
+if [ ! -f platform.txt ]; then
+	echo "Launch this script from the root core folder as ./extra/package.sh VERSION"
+	exit 2
+fi
 
+PACKAGE=ArduinoCore-zephyr
 VERSION=$1
 
-cd ..
-tar  --exclude=extras/** --exclude=.git* --exclude=build --exclude=venv --exclude=samples -cjhf ArduinoCore-zephyr-${VERSION}.tar.bz2 $FOLDER
+TEMP_LIST=$(mktemp)
+
+# import a basic list of files and directories
+cat extra/package.lst | sed -e 's/\s*#.*//' | grep -v '^\s*$' > ${TEMP_LIST}
+
+# add the board-specific files
+extra/get_board_details.sh | jq -cr '.[]' | while read -r item; do
+	variant=$(jq -cr '.variant' <<< "$item")
+	echo "variants/${variant}/" >> ${TEMP_LIST}
+	ls firmwares/zephyr-${variant}.* >> ${TEMP_LIST}
+done
+cat ${TEMP_LIST}
+tar -cjhf ${PACKAGE}-${VERSION}.tar.bz2 -T ${TEMP_LIST} --transform "s,^,${PACKAGE}/,"
+rm -f ${TEMP_LIST}

Diff for: extra/targets.json

@@ -181,6 +181,7 @@ EXPORT_SYMBOL(sin);
 EXPORT_SYMBOL(cos);
 EXPORT_SYMBOL(tan);
 EXPORT_SYMBOL(atan);
+EXPORT_SYMBOL(pow);
 
 EXPORT_SYMBOL(puts);
 EXPORT_SYMBOL(putchar);

Diff for: loader/llext_exports.c

@@ -51,7 +51,7 @@ build.extra_flags=
 build.extra_ldflags=
 compiler.zephyr=
 
-build.ldscript={runtime.platform.path}/variants/llext/linker_script.ld
+build.ldscript={runtime.platform.path}/variants/_llext/linker_script.ld
 build.llext_link_flags=-r -e main
 build.extra_extra_ldflags=
 build.suffix=