Merge pull request #381 from gibix/fix/sketch-sizes

core: fix sketch sizes

Author: pennam

.github/workflows/package_core.yml

@@ -207,9 +207,11 @@ jobs:
 
           # Preprare an archive of the built binaries (and build dir on failure)
           [ "${{ job.status }}" == "failure" ] && FULL_BUILD_DIR="build/${{ matrix.variant }}/"
+          sed -e '/^#/d' boards.local.txt > boards.local_${{ matrix.variant }}.txt
           tar chf - \
             firmwares/*${{ matrix.variant }}* \
             variants/${{ matrix.variant }}/ \
+            boards.local_${{ matrix.variant }}.txt \
             ${FULL_BUILD_DIR} \
           | zstd > binaries-${ARTIFACT_TAG}.tar.zstd
 
@@ -283,6 +285,7 @@ jobs:
           for f in binaries-*.tar.zstd ; do
             tar --use-compress-program=unzstd -xpf $f
           done
+          cat $(ls boards.local_*.txt | sort) >> boards.local.txt
           # Create the core artifact for this set of boards
           ./extra/package_core.sh ${{ matrix.artifact }} ${CORE_TAG} distrib/${CORE_ARTIFACT}
 

.gitignore

@@ -2,9 +2,12 @@
 /distrib/
 /firmwares/*
 /venv/
+/boards.local.txt
+
 llext-edk/
 cflags.txt
 cxxflags.txt
+machine_flags.txt
 includes.txt
 syms-dynamic.ld
 syms-static.ld

boards.txt

@@ -1,3 +1,21 @@
+
+##########################################################################################
+
+# NOTE:
+#
+# The following board-specific properties are auto-generated by 'build.sh'
+# and saved in 'boards.local.txt'. VALUES IN THIS FILE WILL HAVE NO EFFECT.
+#
+# - build.architecture
+# - build.float-abi
+# - build.fpu
+# - build.mcu
+# - upload.address
+# - upload.maximum_data_size
+# - upload.maximum_size
+
+##########################################################################################
+
 menu.debug=Debug
 menu.link_mode=Link mode
 menu.wait_linux_boot=Startup mode
@@ -23,14 +41,9 @@ giga.build.zephyr_args=--shield arduino_giga_display_shield
 giga.build.zephyr_hals=hal_stm32 hal_infineon
 giga.build.variant=arduino_giga_r1_stm32h747xx_m7
 giga.build.artifact=zephyr_main
-giga.build.mcu=cortex-m7
-giga.build.fpu=-mfpu=fpv5-d16
-giga.build.architecture=cortex-m7
 
-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.vid.0=0x2341
 giga.pid.0=0x0066
@@ -47,13 +60,6 @@ giga.upload.interface=0
 giga.upload.use_1200bps_touch=true
 giga.upload.wait_for_upload_port=true
 giga.upload.native_usb=true
-giga.upload.maximum_size=1966080
-giga.upload.maximum_data_size=523624
-
-giga.upload.address=0x080E0000
-
-giga.upload.maximum_size=786432
-giga.upload.maximum_data_size=523624
 
 giga.bootloader.tool=dfu-util
 giga.bootloader.tool.default=dfu-util
@@ -91,14 +97,9 @@ nano33ble.build.zephyr_args=
 nano33ble.build.zephyr_hals=hal_nordic
 nano33ble.build.artifact=zephyr_main
 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.build.float-abi=-mfloat-abi=hard
 nano33ble.build.extra_flags=
 nano33ble.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
-nano33ble.build.architecture=cortex-m4
 nano33ble.build.board=NANO33BLE
 nano33ble.vid.0=0x2341
 nano33ble.pid.0=0x035a
@@ -115,12 +116,6 @@ nano33ble.upload.interface=0
 nano33ble.upload.use_1200bps_touch=true
 nano33ble.upload.wait_for_upload_port=true
 nano33ble.upload.native_usb=true
-nano33ble.upload.maximum_size=1966080
-nano33ble.upload.maximum_data_size=523624
-nano33ble.upload.address=0x60000
-
-nano33ble.upload.maximum_size=786432
-nano33ble.upload.maximum_data_size=523624
 
 nano33ble.bootloader.tool=bossac
 nano33ble.bootloader.tool.default=bossac
@@ -156,14 +151,9 @@ ek_ra8d1.build.zephyr_target=ek_ra8d1
 ek_ra8d1.build.zephyr_args=
 ek_ra8d1.build.zephyr_hals=hal_renesas
 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.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.recipe.hooks.objcopy.postobjcopy.4.pattern=cp {build.variant.path}/flasher.jlink "{build.path}/flasher.jlink"
@@ -184,9 +174,6 @@ ek_ra8d1.upload.interface=0
 ek_ra8d1.upload.use_1200bps_touch=false
 ek_ra8d1.upload.wait_for_upload_port=false
 ek_ra8d1.upload.native_usb=true
-ek_ra8d1.upload.maximum_size=1966080
-ek_ra8d1.upload.maximum_data_size=523624
-ek_ra8d1.upload.address=0x2032000
 ek_ra8d1.upload.target=R7FA8D1AH
 
 ek_ra8d1.bootloader.tool=pyocd
@@ -215,19 +202,14 @@ frdm_mcxn947.build.zephyr_target=frdm_mcxn947//cpu0
 frdm_mcxn947.build.zephyr_args=
 frdm_mcxn947.build.zephyr_hals=hal_nxp
 frdm_mcxn947.build.variant=frdm_mcxn947_mcxn947_cpu0
-frdm_mcxn947.build.mcu=cortex-m33
-frdm_mcxn947.build.fpu=-mfpu=fpv5-sp-d16
-frdm_mcxn947.build.architecture=cortex-m33
 
-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.vid.0=0x1fc9
 frdm_mcxn947.pid.0=0x0143
 frdm_mcxn947.upload_port.0.vid=0x1fc9
 frdm_mcxn947.upload_port.0.pid=0x0143
-frdm_mcxn947.upload.address=0x100F0000
 frdm_mcxn947.upload.target=mcxn947vdf
 
 frdm_mcxn947.upload.tool=pyocd
@@ -240,8 +222,6 @@ frdm_mcxn947.upload.interface=0
 frdm_mcxn947.upload.use_1200bps_touch=false
 frdm_mcxn947.upload.wait_for_upload_port=false
 frdm_mcxn947.upload.native_usb=true
-frdm_mcxn947.upload.maximum_size=1966080
-frdm_mcxn947.upload.maximum_data_size=523624
 
 frdm_mcxn947.bootloader.tool=pyocd
 frdm_mcxn947.bootloader.tool.default=pyocd
@@ -270,14 +250,9 @@ portentah7.build.zephyr_args=
 portentah7.build.zephyr_hals=hal_stm32 hal_infineon
 portentah7.build.artifact=zephyr_main
 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.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_M7
 portentah7.vid.0=0x2341
 portentah7.pid.0=0x005b
@@ -294,13 +269,6 @@ portentah7.upload.interface=0
 portentah7.upload.use_1200bps_touch=true
 portentah7.upload.wait_for_upload_port=true
 portentah7.upload.native_usb=true
-portentah7.upload.maximum_size=1966080
-portentah7.upload.maximum_data_size=523624
-
-portentah7.upload.address=0x080E0000
-
-portentah7.upload.maximum_size=786432
-portentah7.upload.maximum_data_size=523624
 
 portentah7.bootloader.tool=dfu-util
 portentah7.bootloader.tool.default=dfu-util
@@ -338,14 +306,9 @@ nicla_vision.build.zephyr_args=
 nicla_vision.build.zephyr_hals=hal_stm32 hal_infineon
 nicla_vision.build.artifact=zephyr_main
 nicla_vision.build.variant=arduino_nicla_vision_stm32h747xx_m7
-nicla_vision.build.mcu=cortex-m7
-nicla_vision.build.fpu=-mfpu=fpv5-d16
-nicla_vision.build.architecture=cortex-m7
 
-nicla_vision.build.float-abi=-mfloat-abi=softfp
 nicla_vision.build.extra_flags=
 nicla_vision.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
-nicla_vision.build.architecture=cortex-m7
 nicla_vision.build.board=NICLA_VISION
 nicla_vision.vid.0=0x2341
 nicla_vision.pid.0=0x005b
@@ -362,13 +325,6 @@ nicla_vision.upload.interface=0
 nicla_vision.upload.use_1200bps_touch=true
 nicla_vision.upload.wait_for_upload_port=true
 nicla_vision.upload.native_usb=true
-nicla_vision.upload.maximum_size=1966080
-nicla_vision.upload.maximum_data_size=523624
-
-nicla_vision.upload.address=0x080E0000
-
-nicla_vision.upload.maximum_size=786432
-nicla_vision.upload.maximum_data_size=523624
 
 nicla_vision.bootloader.tool=dfu-util
 nicla_vision.bootloader.tool.default=dfu-util
@@ -405,19 +361,14 @@ frdm_rw612.build.zephyr_target=frdm_rw612
 frdm_rw612.build.zephyr_args=
 frdm_rw612.build.zephyr_hals=hal_stm32
 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.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.vid.0=0x1fc9
 frdm_rw612.pid.0=0x0143
 frdm_rw612.upload_port.0.vid=0x1fc9
 frdm_rw612.upload_port.0.pid=0x0143
-frdm_rw612.upload.address=0x18323000
 frdm_rw612.upload.target=rw612
 
 frdm_rw612.upload.tool=pyocd
@@ -430,8 +381,6 @@ frdm_rw612.upload.interface=0
 frdm_rw612.upload.use_1200bps_touch=false
 frdm_rw612.upload.wait_for_upload_port=false
 frdm_rw612.upload.native_usb=true
-frdm_rw612.upload.maximum_size=1966080
-frdm_rw612.upload.maximum_data_size=523624
 
 frdm_rw612.bootloader.tool=pyocd
 frdm_rw612.bootloader.tool.default=pyocd
@@ -455,14 +404,9 @@ niclasense.build.zephyr_args=
 niclasense.build.zephyr_hals=hal_nordic
 niclasense.build.artifact=zephyr_main
 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.build.float-abi=-mfloat-abi=hard
 niclasense.build.extra_flags=
 niclasense.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
-niclasense.build.architecture=cortex-m4
 niclasense.build.board=NICLA_SENSE_ME
 niclasense.vid.0=0x2341
 niclasense.pid.0=0x0360
@@ -480,14 +424,8 @@ niclasense.upload.interface=0
 niclasense.upload.use_1200bps_touch=false
 niclasense.upload.wait_for_upload_port=false
 niclasense.upload.native_usb=false
-niclasense.upload.maximum_size=1966080
-niclasense.upload.maximum_data_size=523624
-niclasense.upload.address=0x70000
 niclasense.upload.target=nrf52
 
-niclasense.upload.maximum_size=786432
-niclasense.upload.maximum_data_size=523624
-
 niclasense.bootloader.tool=openocd
 niclasense.bootloader.tool.default=openocd
 niclasense.bootloader.vid=0x2341
@@ -524,11 +462,7 @@ portentac33.build.zephyr_args=
 portentac33.build.zephyr_hals=hal_renesas nanopb
 portentac33.build.artifact=zephyr_main
 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.build.float-abi=-mfloat-abi=hard
 portentac33.build.extra_flags=
 portentac33.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
 portentac33.build.board=PORTENTA_C33
@@ -548,9 +482,6 @@ portentac33.upload.interface=1
 portentac33.upload.use_1200bps_touch=true
 portentac33.upload.wait_for_upload_port=false
 portentac33.upload.native_usb=true
-portentac33.upload.maximum_size=1966080
-portentac33.upload.maximum_data_size=523624
-portentac33.upload.address=0x100000
 portentac33.upload.dfuse=-Q -w
 
 portentac33.bootloader.tool=dfu-util
@@ -581,14 +512,9 @@ opta.build.zephyr_args=
 opta.build.zephyr_hals=hal_stm32 hal_infineon
 opta.build.artifact=zephyr_main
 opta.build.variant=arduino_opta_stm32h747xx_m7
-opta.build.mcu=cortex-m7
-opta.build.fpu=-mfpu=fpv5-d16
-opta.build.architecture=cortex-m7
 
-opta.build.float-abi=-mfloat-abi=softfp
 opta.build.extra_flags=
 opta.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
-opta.build.architecture=cortex-m7
 opta.build.board=OPTA
 opta.vid.0=0x2341
 opta.pid.0=0x0064
@@ -605,13 +531,6 @@ opta.upload.interface=0
 opta.upload.use_1200bps_touch=true
 opta.upload.wait_for_upload_port=true
 opta.upload.native_usb=true
-opta.upload.maximum_size=1966080
-opta.upload.maximum_data_size=523624
-
-opta.upload.address=0x080E0000
-
-opta.upload.maximum_size=786432
-opta.upload.maximum_data_size=523624
 
 opta.bootloader.tool=dfu-util
 opta.bootloader.tool.default=dfu-util
@@ -645,14 +564,9 @@ nano_matter.build.zephyr_args=
 nano_matter.build.zephyr_hals=hal_silabs
 nano_matter.build.artifact=zephyr_main
 nano_matter.build.variant=arduino_nano_matter_mgm240sd22vna
-nano_matter.build.mcu=cortex-m33
-nano_matter.build.fpu=-mfpu=fpv4-sp-d16
-nano_matter.build.architecture=cortex-m33
 
-nano_matter.build.float-abi=-mfloat-abi=hard
 nano_matter.build.extra_flags=
 nano_matter.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
-nano_matter.build.architecture=cortex-m33
 nano_matter.build.board=ARDUINO_NANO_MATTER
 nano_matter.vid.0=0x2341
 nano_matter.pid.0=0x0072
@@ -663,9 +577,6 @@ nano_matter.upload.tool=openocd
 nano_matter.upload.tool.default=openocd
 nano_matter.upload.config=-f target/efm32s2_g23.cfg
 nano_matter.upload.programmer=-f interface/cmsis-dap.cfg
-nano_matter.upload.maximum_data_size=262144
-nano_matter.upload.maximum_size=1572864
-nano_matter.upload.address=0x080C4000
 nano_matter.upload.protocol=SWD
 nano_matter.upload.setup_command=
 nano_matter.upload.use_1200bps_touch=false
@@ -716,25 +627,17 @@ unoq.build.zephyr_args=
 unoq.build.variant=arduino_uno_q_stm32u585xx
 unoq.build.artifact=zephyr_unoq
 unoq.build.subarch=zephyr
-unoq.build.mcu=cortex-m33
-unoq.build.fpu=-mfpu=fpv5-sp-d16
-unoq.build.architecture=cortex-m33
-unoq.compiler.zephyr.arch.define=
 
 unoq.openocd_cfg=flash_sketch.cfg
-
-unoq.build.float-abi=-mfloat-abi=hard
 unoq.build.extra_flags=
 unoq.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
 unoq.build.board=UNO_Q
 unoq.build.zephyr_hals=hal_stm32
-unoq.compiler.zephyr.arch.define=
-unoq.compiler.zephyr=
+unoq.build.zephyr_toolchain=arm-zephyr-eabi
 unoq.vid.0=0x2341
 unoq.pid.0=0x0078
 unoq.upload_port.0.vid=0x2341
 unoq.upload_port.0.pid=0x0078
-unoq.upload.address=0x8100000
 unoq.upload.target=stm32u585zitxq
 
 unoq.upload.tool=remoteocd
@@ -748,8 +651,6 @@ unoq.upload.interface=0
 unoq.upload.use_1200bps_touch=false
 unoq.upload.wait_for_upload_port=false
 unoq.upload.native_usb=true
-unoq.upload.maximum_size=1966080
-unoq.upload.maximum_data_size=523624
 
 unoq.bootloader.tool=remoteocd
 unoq.bootloader.tool.default=remoteocd