Make boards configuration more flexible

Author: facchinm

boards.txt

@@ -12,19 +12,23 @@ uno2018.upload.protocol=xplainedmini_updi
 uno2018.upload.maximum_size=49152
 uno2018.upload.maximum_data_size=6144
 uno2018.upload.speed=115200
+uno2018.upload.extra_params=-Pusb
+uno2018.upload.extra_files="-Uflash:w:{runtime.platform.path}/bootloaders/{bootloader.file}:i"
 
 uno2018.build.mcu=atmega4809
 uno2018.build.f_cpu=16000000L
 uno2018.build.board=AVR_UNO_WIFI_REV2
 uno2018.build.core=arduino
 uno2018.build.variant=uno2018
+uno2018.build.text_section_start=.text=0x200
 uno2018.build.extra_flags={build.328emulation} -DMILLIS_USE_TIMERB3
 #uno2018.build.extra_flags=-B{runtime.tools.atpack.path}/gcc/dev/{build.mcu}
 
 uno2018.bootloader.tool=avrdude
 uno2018.bootloader.file=atmega4809_uart_bl.hex
 uno2018.bootloader.SYSCFG0=0xC9
 uno2018.bootloader.BOOTEND=0x02
+uno2018.bootloader.OSCCFG=0x01
 uno2018.fuses.file=fuses_4809.bin
 
 menu.mode=Registers emulation
@@ -38,26 +42,30 @@ uno2018.menu.mode.off.build.328emulation=
 nona4809.name=Arduino NONA 4809
 
 nona4809.vid.0=0x2341
-nona4809.pid.0=0x0058
+nona4809.pid.0=0x0557
 
 nona4809.upload.tool=avrdude
 nona4809.upload.protocol=jtag2updi
 nona4809.upload.maximum_size=49152
 nona4809.upload.maximum_data_size=6144
 nona4809.upload.speed=115200
+nona4809.upload.use_1200bps_touch=true
+nona4809.upload.extra_params=-P{serial.port}
 
 nona4809.build.mcu=atmega4809
 nona4809.build.f_cpu=16000000L
-nona4809.build.board=AVR_UNO_WIFI_REV2
+nona4809.build.board=AVR_UNO_NONA_4809
 nona4809.build.core=arduino
 nona4809.build.variant=nona4809
+nona4809.build.text_section_start=.text=0x0
 nona4809.build.extra_flags={build.328emulation} -DMILLIS_USE_TIMERB3
 #nona4809.build.extra_flags=-B{runtime.tools.atpack.path}/gcc/dev/{build.mcu}
 
 nona4809.bootloader.tool=avrdude
 nona4809.bootloader.file=atmega4809_uart_bl.hex
 nona4809.bootloader.SYSCFG0=0xC9
 nona4809.bootloader.BOOTEND=0x00
+nona4809.bootloader.OSCCFG=0x01
 nona4809.fuses.file=fuses_4809.bin
 
 menu.mode=Registers emulation

platform.txt

@@ -21,7 +21,7 @@ compiler.warning_flags.all=-Wall -Wextra
 compiler.path={runtime.tools.avr-gcc-5.4.0-atmel3.6.1-arduino2.path}/bin/
 compiler.c.cmd=avr-gcc
 compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects
-compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections -Wl,--section-start=.text=0x200
+compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections -Wl,--section-start={build.text_section_start}
 compiler.c.elf.cmd=avr-gcc
 compiler.S.flags=-c -g -x assembler-with-cpp -flto -MMD
 compiler.cpp.cmd=avr-g++
@@ -104,22 +104,22 @@ tools.avrdude.upload.params.quiet=-q -q
 # tools.avrdude.upload.verify is needed for backwards compatibility with IDE 1.6.8 or older, IDE 1.6.9 or newer overrides this value
 tools.avrdude.upload.verify=
 tools.avrdude.upload.params.noverify=-V
-tools.avrdude.upload.pattern="{cmd.path}" "-C{config.path}" {upload.verbose} {upload.verify} -p{build.mcu} -c{upload.protocol} -Pusb -b{upload.speed} -e -D "-Uflash:w:{build.path}/{build.project_name}.hex:i" "-Ufuse5:w:{bootloader.SYSCFG0}:m" "-Ufuse8:w:{bootloader.BOOTEND}:m" "-Uflash:w:{runtime.platform.path}/bootloaders/{bootloader.file}:i"
+tools.avrdude.upload.pattern="{cmd.path}" "-C{config.path}" {upload.verbose} {upload.verify} -p{build.mcu} -c{upload.protocol} {upload.extra_params}  -b{upload.speed} -e -D "-Uflash:w:{build.path}/{build.project_name}.hex:i" "-Ufuse2:w:{bootloader.OSCCFG}:m" "-Ufuse5:w:{bootloader.SYSCFG0}:m" "-Ufuse8:w:{bootloader.BOOTEND}:m" {upload.extra_files}
 
 tools.avrdude.program.params.verbose=-v
 tools.avrdude.program.params.quiet=-q -q
 # tools.avrdude.program.verify is needed for backwards compatibility with IDE 1.6.8 or older, IDE 1.6.9 or newer overrides this value
 tools.avrdude.program.verify=
 tools.avrdude.program.params.noverify=-V
-tools.avrdude.program.pattern="{cmd.path}" "-C{config.path}" {program.verbose} {program.verify} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{build.path}/{build.project_name}.hex:i" "-Ufuse5:w:{bootloader.SYSCFG0}:m" "-Ufuse8:w:{bootloader.BOOTEND}:m" "-Uflash:w:{runtime.platform.path}/bootloaders/{bootloader.file}:i"
+tools.avrdude.program.pattern="{cmd.path}" "-C{config.path}" {program.verbose} {program.verify} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{build.path}/{build.project_name}.hex:i" "-Ufuse2:w:{bootloader.OSCCFG}:m" "-Ufuse5:w:{bootloader.SYSCFG0}:m" "-Ufuse8:w:{bootloader.BOOTEND}:m" {upload.extra_files}
 
 tools.avrdude.erase.params.verbose=-v
 tools.avrdude.erase.params.quiet=-q -q
 tools.avrdude.erase.pattern=
 
 tools.avrdude.bootloader.params.verbose=-v
 tools.avrdude.bootloader.params.quiet=-q -q
-tools.avrdude.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Ufuse5:w:{bootloader.SYSCFG0}:m" "-Ufuse8:w:{bootloader.BOOTEND}:m" "-Uflash:w:{runtime.platform.path}/bootloaders/{bootloader.file}:i"
+tools.avrdude.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Ufuse2:w:{bootloader.OSCCFG}:m" "-Ufuse5:w:{bootloader.SYSCFG0}:m" "-Ufuse8:w:{bootloader.BOOTEND}:m" "-Uflash:w:{runtime.platform.path}/bootloaders/{bootloader.file}:i"
 
 tools.avrdude_remote.upload.pattern=/usr/bin/run-avrdude /tmp/sketch.hex {upload.verbose} -p{build.mcu}