Cleanup boards/build.

Former-commit-id: e7265f6

Author: h2zero

boards.txt

@@ -1,6 +1,6 @@
 #if defined(ARDUINO) && defined(NRF51)
 /*
- 
+
 Copyright (c) 2009-2020 ARM Limited. All rights reserved.
 
     SPDX-License-Identifier: Apache-2.0
@@ -38,6 +38,14 @@ NOTICE: This file has been modified by Nordic Semiconductor ASA.
 #elif defined(__STACK_SIZE)
     .align 3
     .equ    Stack_Size, __STACK_SIZE
+#elif defined(DEVICE_RAM_SIZE)
+#if DEVICE_RAM_SIZE > 16
+    .align 3
+    .equ    Stack_Size, 1024
+#else
+    .align 3
+    .equ    Stack_Size, 400
+#endif
 #else
     .align 3
     .equ    Stack_Size, 2048
@@ -141,7 +149,7 @@ __isr_vector:
 Reset_Handler:
 
     MOVS    R1, #NRF_POWER_RAMONx_RAMxON_ONMODE_Msk
-    
+
     LDR     R0, =NRF_POWER_RAMON_ADDRESS
     LDR     R2, [R0]
     ORRS    R2, R1

cores/nRF5/nordic/linker/gcc_startup_nrf51.S

@@ -1,6 +1,6 @@
 #if defined(ARDUINO) && defined(NRF52832_XXAA)
 /*
- 
+
 Copyright (c) 2009-2020 ARM Limited. All rights reserved.
 
     SPDX-License-Identifier: Apache-2.0
@@ -40,7 +40,7 @@ NOTICE: This file has been modified by Nordic Semiconductor ASA.
     .equ    Stack_Size, __STACK_SIZE
 #else
     .align 3
-    .equ    Stack_Size, 4096
+    .equ    Stack_Size, 2048
 #endif
     .globl __StackTop
     .globl __StackLimit

cores/nRF5/nordic/linker/gcc_startup_nrf52.S

@@ -1,6 +1,6 @@
 #if defined(ARDUINO) && defined(NRF52833_XXAA)
 /*
- 
+
 Copyright (c) 2009-2020 ARM Limited. All rights reserved.
 
     SPDX-License-Identifier: Apache-2.0
@@ -40,7 +40,7 @@ NOTICE: This file has been modified by Nordic Semiconductor ASA.
     .equ    Stack_Size, __STACK_SIZE
 #else
     .align 3
-    .equ    Stack_Size, 8192
+    .equ    Stack_Size, 2048
 #endif
     .globl __StackTop
     .globl __StackLimit

cores/nRF5/nordic/linker/gcc_startup_nrf52833.S

@@ -1,6 +1,6 @@
 #if defined(ARDUINO) && defined(NRF52840_XXAA)
 /*
- 
+
 Copyright (c) 2009-2020 ARM Limited. All rights reserved.
 
     SPDX-License-Identifier: Apache-2.0
@@ -40,7 +40,7 @@ NOTICE: This file has been modified by Nordic Semiconductor ASA.
     .equ    Stack_Size, __STACK_SIZE
 #else
     .align 3
-    .equ    Stack_Size, 16384
+    .equ    Stack_Size, 2048
 #endif
     .globl __StackTop
     .globl __StackLimit

cores/nRF5/nordic/linker/gcc_startup_nrf52840.S

@@ -51,10 +51,10 @@ compiler.define=-DARDUINO=
 
 # this can be overriden in boards.txt
 build.extra_flags=
-build.lfclk_flags=
 build.dfu_pattern=echo
 
-nrf52.dfu_pattern="{tools.nrfutil.cmd}" pkg generate --hw-version 52 --debug-mode --sd-req 0 --application "{build.path}/{build.project_name}.hex" "{build.path}/{build.project_name}.zip"
+build.flags.usb= -DUSBCON -DUSE_TINYUSB -DUSB_VID={build.vid} -DUSB_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
+nrfutil.dfu_pattern="{tools.nrfutil.cmd}" pkg generate --hw-version 52 --debug-mode --sd-req 0 --application "{build.path}/{build.project_name}.hex" "{build.path}/{build.project_name}.zip"
 nordic.path={build.core.path}/nordic
 
 compiler.nrf.flags=-DNRF5 -DARDUINO_ARCH_NRF5 "-I{build.core.path}/nimble_config" "-I{nordic.path}/nrfx" "-I{nordic.path}/nrfx/hal" "-I{nordic.path}/nrfx/mdk" "-I{nordic.path}/nrfx/soc" "-I{nordic.path}/nrfx/drivers/include" "-I{nordic.path}/nrfx/drivers/src" "-I{build.core.path}/CMSIS/Include" "-I{build.core.path}/FC_Store" "-I{build.core.path}/BLEBond_nvs" "-I{build.core.path}/TinyUSB" "-I{build.core.path}/TinyUSB/Adafruit_TinyUSB_ArduinoCore" "-I{build.core.path}/TinyUSB/Adafruit_TinyUSB_ArduinoCore/tinyusb/src"
@@ -84,13 +84,13 @@ recipe.hooks.prebuild.2.pattern.windows=cmd /c if not exist "{build.path}\build_
 # ----------------
 
 ## Compile c files
-recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} {compiler.c.extra_flags} {build.extra_flags} {compiler.nrf.flags} {build.lfclk_flags} "@{build.opt.path}" {includes} "{source_file}" -o "{object_file}"
+recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} {compiler.c.extra_flags} {build.extra_flags} {compiler.nrf.flags} "@{build.opt.path}" {includes} "{source_file}" -o "{object_file}"
 
 ## Compile c++ files
-recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} {compiler.cpp.extra_flags} {build.extra_flags} {compiler.nrf.flags} {build.lfclk_flags} "@{build.opt.path}" {includes} "{source_file}" -o "{object_file}"
+recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} {compiler.cpp.extra_flags} {build.extra_flags} {compiler.nrf.flags} "@{build.opt.path}" {includes} "{source_file}" -o "{object_file}"
 
 ## Compile S files
-recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} {compiler.S.extra_flags} {build.extra_flags} {build.lfclk_flags} "@{build.opt.path}" {includes} "{source_file}" -o "{object_file}"
+recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} {compiler.S.extra_flags} {build.extra_flags} "@{build.opt.path}" {includes} "{source_file}" -o "{object_file}"
 
 ## Create archives
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
@@ -184,4 +184,8 @@ tools.nrfutil.cmd.macosx={runtime.platform.path}/tools/nrfutil/nrfutil-mac
 
 tools.nrfutil.upload.params.verbose=
 tools.nrfutil.upload.params.quiet=
-tools.nrfutil.upload.pattern="{cmd}" dfu serial -pkg "{build.path}/{build.project_name}.zip" -p {serial.port} -b 115200
+tools.nrfutil.upload.pattern="{cmd}" dfu serial -pkg "{build.path}/{build.project_name}.zip" -p {serial.port} -b 115200
+
+tools.nrfutil.program.params.verbose=
+tools.nrfutil.program.params.quiet=
+tools.nrfutil.program.pattern="{cmd}" dfu serial -pkg "{build.path}/{build.project_name}.zip" -p {serial.port} -b 115200

platform.txt

@@ -3,27 +3,31 @@ jlink.communication=USB
 jlink.protocol=jlink
 jlink.program.protocol=jlink
 jlink.program.tool=openocd
+jlink.bootloader.tool=openocd
 jlink.program.setup_command=transport select swd; set WORKAREASIZE 0;
 
 stlink.name=ST-Link V2
 stlink.communication=USB
 stlink.protocol=stlink
 stlink.program.protocol=stlink
 stlink.program.tool=openocd
+stlink.bootloader.tool=openocd
 stlink.program.setup_command=transport select hla_swd; set WORKAREASIZE 0x4000;
 
 cmsisdap.name=CMSIS-DAP
 cmsisdap.communication=USB
 cmsisdap.protocol=cmsis-dap
 cmsisdap.program.protocol=cmsis-dap
 cmsisdap.program.tool=openocd
-cmsisdap.program.setup_command=;
+cmsisdap.bootloader.tool=openocd
+cmsisdap.program.setup_command=transport select hla_swd;
 
 blackmagicprobe.name=Black Magic Probe (GDB)
 blackmagicprobe.communication=USB
 blackmagicprobe.protocol=
 blackmagicprobe.program.protocol=
 blackmagicprobe.program.tool=blackmagicprobe
+blackmagicprobe.bootloader.tool=blackmagicprobe
 blackmagicprobe.program.extra_params=;
 
 nrfutil.name=nrfutil

programmers.txt

@@ -19,6 +19,7 @@
 
 /** Master clock frequency */
 #define VARIANT_MCK       (16000000ul)
+#define USE_LFRC
 
 /*----------------------------------------------------------------------------
  *        Headers