Cleanup platform.txt, expose more upload properties in boards.txt

boards.txt

@@ -20,17 +20,21 @@ nRF52DK.vid.0=0x1366
 nRF52DK.pid.0=0x1015
 
 nRF52DK.upload.tool=Nordic:openocd
-nRF52DK.upload.protocol=jlink
+nRF52DK.upload.protocol=
+nRF52DK.upload.interface=jlink
+nRF52DK.upload.target=nrf51
+nRF52DK.upload.address=0x0
 nRF52DK.upload.maximum_size=524288
 nRF52DK.upload.setup_command=transport select swd
 nRF52DK.upload.use_1200bps_touch=false
 nRF52DK.upload.wait_for_upload_port=false
 nRF52DK.upload.native_usb=false
+
 nRF52DK.build.mcu=cortex-m4
 nRF52DK.build.f_cpu=16000000
 nRF52DK.build.board=NRF52_DK
 nRF52DK.build.core=nRF52
 nRF52DK.build.variant=nRF52DK
 nRF52DK.build.variant_system_lib=
-nRF52DK.build.extra_flags=-DGLAH
+nRF52DK.build.extra_flags=
 nRF52DK.build.ldscript=linker_scripts/gcc/nRF52DK.ld

platform.txt

@@ -48,10 +48,12 @@ compiler.define=-DARDUINO=
 # this can be overriden in boards.txt
 build.extra_flags=
 
+compiler.nrf.flags=-DNRF52 "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/toolchain/" "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/toolchain/gcc/" "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/drivers_nrf/hal/" "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/device/"
+
 # These can be overridden in platform.local.txt
-compiler.c.extra_flags=-DNRF52 "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/toolchain/" "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/toolchain/gcc/" "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/drivers_nrf/delay/" "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/drivers_nrf/hal/" "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/device/"
+compiler.c.extra_flags={compiler.nrf.flags}
 compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=-DNRF52 "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/toolchain/" "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/toolchain/gcc/" "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/drivers_nrf/delay/" "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/drivers_nrf/hal/" "-I{runtime.platform.path}/cores/nRF52/nRF52_SDK_0/components/device/"
+compiler.cpp.extra_flags={compiler.nrf.flags}
 compiler.S.extra_flags=
 compiler.ar.extra_flags=
 compiler.elf2hex.extra_flags=
@@ -96,4 +98,4 @@ tools.openocd.cmd.windows=bin/openocd.exe
 
 tools.openocd.upload.params.verbose=-d2
 tools.openocd.upload.params.quiet=-d0
-tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -f interface/{upload.protocol}.cfg -c "{upload.setup_command}" -f target/nrf51.cfg -c "init ; reset halt ; nrf51 mass_erase ; sleep 500 ; program {{{build.path}/{build.project_name}.bin}} verify reset 0x0; shutdown; "
+tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -f interface/{upload.interface}.cfg -c "{upload.setup_command}" -f target/{upload.target}.cfg -c "program {{{build.path}/{build.project_name}.bin}} verify reset {upload.address}; shutdown; "