Skip to content

Commit 879dc54

Browse files
committed
platform: remove useless vars
- compiler.zephyr.arch.define is always included in generated cflags/cxxflags - compiler.zephyr is always empty - build.extra_extra_ldflags is not used anywhere
1 parent 7b5343f commit 879dc54

File tree

2 files changed

+3
-29
lines changed

2 files changed

+3
-29
lines changed

boards.txt

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@ giga.build.variant=arduino_giga_r1_stm32h747xx_m7
1919
giga.build.mcu=cortex-m7
2020
giga.build.fpu=-mfpu=fpv5-d16
2121
giga.build.architecture=cortex-m7
22-
giga.compiler.zephyr.arch.define=-DCORE_CM7
2322

2423
giga.build.float-abi=-mfloat-abi=softfp
2524
giga.build.extra_flags=
2625
giga.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
2726
giga.build.architecture=cortex-m7
2827
giga.build.board=ARDUINO_GIGA
29-
giga.compiler.zephyr=
3028
giga.vid.0=0x2341
3129
giga.pid.0=0x0066
3230
giga.upload_port.0.vid=0x2341
@@ -85,14 +83,12 @@ nano33ble.build.variant=arduino_nano_33_ble_nrf52840_sense
8583
nano33ble.build.mcu=cortex-m4
8684
nano33ble.build.fpu=-mfpu=fpv4-sp-d16
8785
nano33ble.build.architecture=cortex-m4
88-
nano33ble.compiler.zephyr.arch.define=
8986

9087
nano33ble.build.float-abi=-mfloat-abi=hard
9188
nano33ble.build.extra_flags=
9289
nano33ble.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
9390
nano33ble.build.architecture=cortex-m4
9491
nano33ble.build.board=ARDUINO_NANO33BLE
95-
nano33ble.compiler.zephyr=
9692
nano33ble.vid.0=0x2341
9793
nano33ble.pid.0=0x035a
9894
nano33ble.upload_port.0.vid=0x2341
@@ -149,19 +145,16 @@ ek_ra8d1.build.variant=ek_ra8d1_r7fa8d1bhecbd
149145
ek_ra8d1.build.mcu=cortex-m85+nomve
150146
ek_ra8d1.build.fpu=-mfpu=fpv5-d16
151147
ek_ra8d1.build.architecture=cortex-m85+nomve
152-
ek_ra8d1.compiler.zephyr.arch.define=
153148

154149
ek_ra8d1.build.float-abi=-mfloat-abi=hard
155150
ek_ra8d1.build.extra_flags=
156151
ek_ra8d1.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
157152
ek_ra8d1.build.architecture=cortex-m85+nomve
158153
ek_ra8d1.build.board=EK_RA8D1
159-
ek_ra8d1.compiler.zephyr.arch.define=
160154

161155
#ek_ra8d1.recipe.hooks.objcopy.postobjcopy.4.pattern=cp {build.variant.path}/flasher.jlink "{build.path}/flasher.jlink"
162156
#ek_ra8d1.recipe.hooks.objcopy.postobjcopy.5.pattern=sed -i 's|SKETCH|"{build.path}/{build.project_name}.llext.dfu.bin"|g' "{build.path}/flasher.jlink"
163157

164-
ek_ra8d1.compiler.zephyr=
165158
ek_ra8d1.vid.0=0x2341
166159
ek_ra8d1.pid.0=0x0077
167160
ek_ra8d1.upload_port.0.vid=0x2341
@@ -208,14 +201,11 @@ frdm_mcxn947.build.variant=frdm_mcxn947_mcxn947_cpu0
208201
frdm_mcxn947.build.mcu=cortex-m33
209202
frdm_mcxn947.build.fpu=-mfpu=fpv5-sp-d16
210203
frdm_mcxn947.build.architecture=cortex-m33
211-
frdm_mcxn947.compiler.zephyr.arch.define=
212204

213205
frdm_mcxn947.build.float-abi=-mfloat-abi=hard
214206
frdm_mcxn947.build.extra_flags=
215207
frdm_mcxn947.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
216208
frdm_mcxn947.build.board=FRDM_MCXN947
217-
frdm_mcxn947.compiler.zephyr.arch.define=
218-
frdm_mcxn947.compiler.zephyr=
219209
frdm_mcxn947.vid.0=0x1fc9
220210
frdm_mcxn947.pid.0=0x0143
221211
frdm_mcxn947.upload_port.0.vid=0x1fc9
@@ -262,14 +252,12 @@ portentah7.build.variant=arduino_portenta_h7_stm32h747xx_m7
262252
portentah7.build.mcu=cortex-m7
263253
portentah7.build.fpu=-mfpu=fpv5-d16
264254
portentah7.build.architecture=cortex-m7
265-
portentah7.compiler.zephyr.arch.define=-DCORE_CM7
266255

267256
portentah7.build.float-abi=-mfloat-abi=softfp
268257
portentah7.build.extra_flags=
269258
portentah7.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
270259
portentah7.build.architecture=cortex-m7
271260
portentah7.build.board=ARDUINO_PORTENTA_H7
272-
portentah7.compiler.zephyr=
273261
portentah7.vid.0=0x2341
274262
portentah7.pid.0=0x005b
275263
portentah7.upload_port.0.vid=0x2341
@@ -328,14 +316,11 @@ frdm_rw612.build.variant=frdm_rw612_rw612
328316
frdm_rw612.build.mcu=cortex-m33+nodsp
329317
frdm_rw612.build.fpu=-mfpu=fpv5-sp-d16
330318
frdm_rw612.build.architecture=cortex-m33+nodsp
331-
frdm_rw612.compiler.zephyr.arch.define=
332319

333320
frdm_rw612.build.float-abi=-mfloat-abi=hard
334321
frdm_rw612.build.extra_flags=
335322
frdm_rw612.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
336323
frdm_rw612.build.board=FRDM_RW612
337-
frdm_rw612.compiler.zephyr.arch.define=
338-
frdm_rw612.compiler.zephyr=
339324
frdm_rw612.vid.0=0x1fc9
340325
frdm_rw612.pid.0=0x0143
341326
frdm_rw612.upload_port.0.vid=0x1fc9
@@ -381,14 +366,12 @@ niclasense.build.variant=arduino_nicla_sense_me_nrf52832
381366
niclasense.build.mcu=cortex-m4
382367
niclasense.build.fpu=-mfpu=fpv4-sp-d16
383368
niclasense.build.architecture=cortex-m4
384-
niclasense.compiler.zephyr.arch.define=
385369

386370
niclasense.build.float-abi=-mfloat-abi=hard
387371
niclasense.build.extra_flags=
388372
niclasense.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
389373
niclasense.build.architecture=cortex-m4
390374
niclasense.build.board=ARDUINO_NICLA_SENSE_ME
391-
niclasense.compiler.zephyr=
392375
niclasense.vid.0=0x2341
393376
niclasense.pid.0=0x0360
394377
niclasense.upload_port.0.vid=0x2341
@@ -449,7 +432,6 @@ portentac33.menu.mode.linked=linked
449432

450433
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
451434
portentac33.menu.mode.linked.build.llext_link_flags=
452-
portentac33.menu.mode.linked.build.suffix=_linked
453435
portentac33.menu.mode.linked.build.ldscript={runtime.platform.path}/variants/_linked/linker_script.ld
454436
portentac33.menu.mode.linked.upload.extension=bin-zsk.bin
455437
portentac33.menu.mode.linked.postbuild_mode=-prelinked
@@ -461,14 +443,11 @@ portentac33.build.variant=arduino_portenta_c33_r7fa6m5bh3cfc
461443
portentac33.build.mcu=cortex-m33
462444
portentac33.build.fpu=-mfpu=fpv5-sp-d16
463445
portentac33.build.architecture=cortex-m33
464-
portentac33.compiler.zephyr.arch.define=
465446

466447
portentac33.build.float-abi=-mfloat-abi=hard
467448
portentac33.build.extra_flags=
468449
portentac33.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
469450
portentac33.build.board=ARDUINO_PORTENTA_C33
470-
portentac33.compiler.zephyr.arch.define=
471-
portentac33.compiler.zephyr=
472451
portentac33.vid.0=0x2341
473452
portentac33.pid.0=0x0068
474453
portentac33.upload_port.0.vid=0x2341
@@ -517,14 +496,12 @@ opta.build.variant=arduino_opta_stm32h747xx_m7
517496
opta.build.mcu=cortex-m7
518497
opta.build.fpu=-mfpu=fpv5-d16
519498
opta.build.architecture=cortex-m7
520-
opta.compiler.zephyr.arch.define=-DCORE_CM7
521499

522500
opta.build.float-abi=-mfloat-abi=softfp
523501
opta.build.extra_flags=
524502
opta.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
525503
opta.build.architecture=cortex-m7
526504
opta.build.board=ARDUINO_OPTA
527-
opta.compiler.zephyr=
528505
opta.vid.0=0x2341
529506
opta.pid.0=0x0064
530507
opta.upload_port.0.vid=0x2341

platform.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ compiler.warning_flags.all=-Wall -Wextra
1717

1818
compiler.path={build.compiler_path}
1919
compiler.c.cmd={build.crossprefix}gcc
20-
compiler.c.flags=-g -c {compiler.warning_flags} {compiler.zephyr.macros} "@{compiler.zephyr.cflags_file}" {compiler.zephyr.arch.define} -MMD -mcpu={build.mcu} {build.float-abi} {build.fpu}
20+
compiler.c.flags=-g -c {compiler.warning_flags} {compiler.zephyr.macros} "@{compiler.zephyr.cflags_file}" -MMD -mcpu={build.mcu} {build.float-abi} {build.fpu}
2121
compiler.c.elf.cmd={build.crossprefix}g++
2222
compiler.c.elf.flags={build.llext_link_flags} -Wl,--gc-sections -mcpu={build.mcu} {build.float-abi} {build.fpu} -std=gnu++17
2323
compiler.S.cmd={build.crossprefix}g++
2424
compiler.S.flags=-c -x assembler-with-cpp -mcpu={build.mcu} {build.fpu}
2525
compiler.cpp.cmd={build.crossprefix}g++
26-
compiler.cpp.flags=-g -Os -std=gnu++17 -c {compiler.warning_flags} {compiler.zephyr.macros} "@{compiler.zephyr.cxxflags_file}" {compiler.zephyr.common_ldflags} {compiler.zephyr.extra_ldflags} {compiler.zephyr.common_cxxflags} {compiler.zephyr.extra_cxxflags} {compiler.zephyr.arch.define} -MMD -mcpu={build.mcu} {build.float-abi} {build.fpu}
26+
compiler.cpp.flags=-g -Os -std=gnu++17 -c {compiler.warning_flags} {compiler.zephyr.macros} "@{compiler.zephyr.cxxflags_file}" {compiler.zephyr.common_ldflags} {compiler.zephyr.extra_ldflags} {compiler.zephyr.common_cxxflags} {compiler.zephyr.extra_cxxflags} -MMD -mcpu={build.mcu} {build.float-abi} {build.fpu}
2727
compiler.ar.cmd={build.crossprefix}ar
2828
compiler.ar.flags=rcs
2929
compiler.objcopy.cmd=
@@ -49,12 +49,9 @@ compiler.zephyr.extra_ldflags=-lstdc++ -lsupc++
4949
# this can be overriden in boards.txt
5050
build.extra_flags=
5151
build.extra_ldflags=
52-
compiler.zephyr=
5352

5453
build.ldscript={runtime.platform.path}/variants/_llext/linker_script.ld
5554
build.llext_link_flags=-r -e main
56-
build.extra_extra_ldflags=
57-
build.suffix=
5855
upload.extension=elf-zsk.bin
5956
postbuild_debug=
6057
postbuild_mode=
@@ -99,7 +96,7 @@ recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DARDUIN
9996
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
10097

10198
## Combine gc-sections, archives, and objects
102-
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} {compiler.zephyr.extra_ldflags} {compiler.libraries.ldflags} -Wl,--end-group
99+
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
103100
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"
104101

105102
## Create eeprom

0 commit comments

Comments
 (0)