platform: generic 'static' and 'dynamic' builds

Refactor C33 'linked' mode into a common 'static' build, and the usual
LLEXT mode as 'dynamic' build.

Author: pillo79

boards.txt

@@ -1,5 +1,7 @@
 menu.debug=Debug
-menu.mode=Mode
+menu.link_mode=Link mode
+
+##########################################################################################
 
 giga.name=Arduino Giga R1
 giga.build.core=arduino
@@ -423,18 +425,12 @@ portentac33.build.compiler_path={runtime.tools.arm-zephyr-eabi-0.16.8.path}/bin/
 
 portentac33.menu.debug.false=Standard
 portentac33.menu.debug.true=Debug
+portentac33.menu.debug.true.build.zsk_args.debug=-debug
 
-portentac33.menu.debug.false.postbuild_debug=
-portentac33.menu.debug.true.postbuild_debug=-debug
-
-portentac33.menu.mode.llext=llext
-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.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.menu.link_mode.dynamic=Dynamic
+portentac33.menu.link_mode.static=Static
+portentac33.menu.link_mode.static.build.link_mode=static
+portentac33.menu.link_mode.static.upload.extension=bin-zsk.bin
 
 portentac33.build.zephyr_target=arduino_portenta_c33
 portentac33.build.zephyr_args=

extra/package_core.inc

@@ -13,5 +13,4 @@ README.md
 doc/
 cores/
 libraries/
-variants/_llext/
-variants/_linked/
+variants/_ldscripts/

platform.txt

@@ -19,7 +19,7 @@ compiler.path={build.compiler_path}
 compiler.c.cmd={build.crossprefix}gcc
 compiler.c.flags=-g -c {compiler.warning_flags} {compiler.zephyr.macros} "@{compiler.zephyr.cflags_file}" -MMD -mcpu={build.mcu} {build.float-abi} {build.fpu}
 compiler.c.elf.cmd={build.crossprefix}g++
-compiler.c.elf.flags={build.llext_link_flags} -Wl,--gc-sections -mcpu={build.mcu} {build.float-abi} {build.fpu} -std=gnu++17
+compiler.c.elf.flags=-Wl,--gc-sections -mcpu={build.mcu} {build.float-abi} {build.fpu} -std=gnu++17
 compiler.S.cmd={build.crossprefix}g++
 compiler.S.flags=-c -x assembler-with-cpp -mcpu={build.mcu} {build.fpu}
 compiler.cpp.cmd={build.crossprefix}g++
@@ -46,15 +46,28 @@ compiler.zephyr.common_ldflags=-fno-exceptions -fno-rtti -fno-threadsafe-statics
 compiler.zephyr.extra_cxxflags=
 compiler.zephyr.extra_ldflags=-lstdc++ -lsupc++
 
-# this can be overriden in boards.txt
+# these can be overriden in boards.txt
 build.extra_flags=
 build.extra_ldflags=
-
-build.ldscript={runtime.platform.path}/variants/_llext/linker_script.ld
-build.llext_link_flags=-r -e main
+build.link_mode=dynamic
 upload.extension=elf-zsk.bin
-postbuild_debug=
-postbuild_mode=
+
+build.ldscript.path={runtime.platform.path}/variants/_ldscripts
+build.link_command="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" "-L{build.variant.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {build.extra_flags} {build.extra_ldflags} {compiler.zephyr.common_ldflags} --specs=picolibc.specs --specs=nosys.specs {compiler.ldflags} {object_files} -Wl,--start-group "{build.path}/{archive_file}" {compiler.zephyr.extra_ldflags} {compiler.libraries.ldflags} -Wl,--end-group {build.link_args.{build.link_mode}}
+
+# link_args.* are included by any link_command depending on the link_mode
+build.link_args.dynamic=-e main
+build.link_args.static=-lc -lm -lgcc -L{build.variant.path} -Wl,--wrap=random -Wl,--wrap=calloc -Wl,--wrap=free -Wl,--wrap=malloc -Wl,--wrap=realloc 
+
+# link_args.build-* are used to create the final binary. -common are added to both static and dynamic.
+build.link_args.build-dynamic="-T{build.ldscript.path}/dynamic.ld" -r
+build.link_args.build-static="-T{build.variant.path}/provides.ld" "-T{build.ldscript.path}/static.ld"
+build.link_args.build-common="-Wl,-Map,{build.path}/{build.project_name}.map" -o "{build.path}/{build.project_name}_debug.elf"
+
+# zsk_args are used to create the final binary with zephyr-sketch-tool
+build.zsk_args.debug=
+build.zsk_args.mode-dynamic=
+build.zsk_args.mode-static=-prelinked
 
 # These can be overridden in platform.local.txt
 compiler.c.extra_flags=
@@ -96,7 +109,7 @@ recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DARDUIN
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {build.extra_flags} {build.extra_ldflags} {compiler.zephyr.common_ldflags} "-T{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=picolibc.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}_debug.elf" {object_files} -Wl,--start-group "{build.path}/{archive_file}" {compiler.zephyr.extra_ldflags} {compiler.libraries.ldflags} -Wl,--end-group
+recipe.c.combine.pattern={build.link_command} {build.link_args.build-{build.link_mode}} {build.link_args.build-common}
 recipe.hooks.linking.postlink.1.pattern="{compiler.path}{build.crossprefix}strip" --strip-debug "{build.path}/{build.project_name}_debug.elf" -o "{build.path}/{build.project_name}.elf"
 
 ## Create eeprom
@@ -109,8 +122,8 @@ recipe.objcopy.bin.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf
 recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
 
 ## Mangle the file
-recipe.hooks.objcopy.postobjcopy.1.pattern="{runtime.tools.zephyr-sketch-tool.path}/zephyr-sketch-tool" {postbuild_debug} {postbuild_mode} "{build.path}/{build.project_name}.elf"
-recipe.hooks.objcopy.postobjcopy.2.pattern="{runtime.tools.zephyr-sketch-tool.path}/zephyr-sketch-tool" {postbuild_debug} {postbuild_mode} "{build.path}/{build.project_name}.bin"
+recipe.hooks.objcopy.postobjcopy.1.pattern="{runtime.tools.zephyr-sketch-tool.path}/zephyr-sketch-tool" {build.zsk_args.debug} {build.zsk_args.mode-{build.link_mode}} "{build.path}/{build.project_name}.elf"
+recipe.hooks.objcopy.postobjcopy.2.pattern="{runtime.tools.zephyr-sketch-tool.path}/zephyr-sketch-tool" {build.zsk_args.debug} {build.zsk_args.mode-{build.link_mode}} "{build.path}/{build.project_name}.bin"
 
 ## Compute size
 recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"