Parameterize linker script

main.c

@@ -199,7 +199,7 @@ void cleanup_after_vm(supervisor_allocation* heap) {
 
 bool run_code_py(safe_mode_t safe_mode) {
     bool serial_connected_at_start = serial_connected();
-    #ifdef CIRCUITPY_AUTORELOAD_DELAY_MS
+    #if CIRCUITPY_AUTORELOAD_DELAY_MS > 0
     if (serial_connected_at_start) {
         serial_write("\n");
         if (autoreload_is_enabled()) {

ports/atmel-samd/Makefile

@@ -292,12 +292,17 @@ SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE))
                              $(addprefix shared-module/, $(SRC_SHARED_MODULE)) \
                              $(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
 
+# There may be duplicates between SRC_COMMON_HAL_EXPANDED and SRC_SHARED_MODULE_EXPANDED,
+# because a few modules have files both in common-hal/ and shared-modules/.
+# Doing a $(sort ...) removes duplicates as part of sorting.
+SRC_COMMON_HAL_SHARED_MODULE_EXPANDED = $(sort $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED))
+
+
 SRC_S = supervisor/$(CHIP_FAMILY)_cpu.s
 
 OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_ASF:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED_MODULE_EXPANDED:.c=.o))
 ifeq ($(INTERNAL_LIBM),1)
 OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))
 endif
@@ -310,9 +315,18 @@ SRC_QSTR_PREPROCESSOR += peripherals/samd/$(CHIP_FAMILY)/clocks.c
 
 all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2
 
-$(BUILD)/firmware.elf: $(OBJ)
+LD_FILE = $(BUILD)/$(notdir $(patsubst %.template.ld,%.ld,$(LD_TEMPLATE_FILE)))
+
+# ld_defines.pp is generated from ld_defines.c. See py/mkrules.mk.
+# Run gen_ld_files.py over ALL *.template.ld files, not just LD_TEMPLATE_FILE,
+# because it may include other template files.
+$(LD_FILE): $(BUILD)/ld_defines.pp boards/*.template.ld
+	$(STEPECHO) "GEN $@"
+	$(Q)$(PYTHON3) $(TOP)/tools/gen_ld_files.py --defines $< --out_dir $(BUILD) boards/*.template.ld
+
+$(BUILD)/firmware.elf: $(OBJ) $(LD_FILE)
 	$(STEPECHO) "LINK $@"
-	$(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(LIBS) -Wl,--end-group
+	$(Q)$(CC) -o $@ $(LDFLAGS) $(OBJ) -Wl,--start-group $(LIBS) -Wl,--end-group
 	$(Q)$(SIZE) $@ | $(PYTHON3) $(TOP)/tools/build_memory_info.py $(LD_FILE)
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf

ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.h

@@ -7,10 +7,6 @@
 
 #define MICROPY_HW_LED_STATUS   (&pin_PB23)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA09)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA08)
 

ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x2341
 USB_PID = 0x8053
 USB_PRODUCT = "Arduino MKR1300"

ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.h

@@ -5,10 +5,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA09)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA08)
 

ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x239A
 USB_PID = 0x8050
 USB_PRODUCT = "Arduino MKRZero"

ports/atmel-samd/boards/arduino_zero/mpconfigboard.h

@@ -10,10 +10,6 @@
 #define MICROPY_PORT_B        (PORT_PB03)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)
 

ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x2341
 USB_PID = 0x824D
 USB_PRODUCT = "Arduino Zero"

ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.h

@@ -5,6 +5,7 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
+// No microcontroller.nvm
 #define CIRCUITPY_INTERNAL_NVM_SIZE 0
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PA08)
@@ -17,8 +18,6 @@
 #define DEFAULT_UART_BUS_RX (&pin_PA01)
 #define DEFAULT_UART_BUS_TX (&pin_PA00)
 
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
-
 #define IGNORE_PIN_PA03     1
 #define IGNORE_PIN_PA12     1
 #define IGNORE_PIN_PA13     1

ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x1209
 USB_PID = 0xBAB3
 USB_PRODUCT = "Bast Pro Mini M0"

ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.h

@@ -3,7 +3,6 @@
 
 #define CIRCUITPY_MCU_FAMILY samd51
 
-
 #define MICROPY_HW_LED_STATUS   (&pin_PA22)
 
 // These are pins not to reset.
@@ -14,14 +13,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)
 

ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x04D8
 USB_PID = 0xEDB3
 USB_PRODUCT = "Programmable USB Hub"

ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.h

@@ -7,14 +7,10 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
 #define DEFAULT_SPI_BUS_SCK (&pin_PA19)
 #define DEFAULT_SPI_BUS_MOSI (&pin_PA18)
 #define DEFAULT_SPI_BUS_MISO (&pin_PA22)
 
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define IGNORE_PIN_PA00     1
 #define IGNORE_PIN_PA01     1
 #define IGNORE_PIN_PA02     1

ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x1209
 USB_PID = 0xBAB2
 USB_PRODUCT = "CatWAN USBStick"

ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h

@@ -22,12 +22,6 @@
 
 #define SPEAKER_ENABLE_PIN    (&pin_PA30)
 
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.

ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
 USB_VID = 0x239A
 USB_PID = 0x8019
 USB_PRODUCT = "CircuitPlayground Express"

ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h

@@ -22,12 +22,6 @@
 
 #define SPEAKER_ENABLE_PIN    (&pin_PA30)
 
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.

ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
 USB_VID = 0x239A
 USB_PID = 0x8019
 USB_PRODUCT = "CircuitPlayground Express with Crickit libraries"

ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h

@@ -22,12 +22,6 @@
 
 #define SPEAKER_ENABLE_PIN    (&pin_PA30)
 
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.

ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
 USB_VID = 0x239A
 USB_PID = 0x8019
 USB_PRODUCT = "CircuitPlayground Express with displayio"

ports/atmel-samd/boards/common.template.ld

@@ -0,0 +1,89 @@
+/* Template for SAMD21/SAMD51 linking. dollar-sign-curly-bracket items are replaced with strings. */
+
+/* Specify the memory areas */
+MEMORY
+{
+    /* CIRCUITPY_BOOTLOADER_SIZE is size of bootloader, if any.
+     * SAMD21 Arduino and UF2 bootloaders are 8KiB. SAMD51 UF2 is 6KiB.
+     * FLASH_SIZE is defined in ASF4.
+     * RAM_SIZE is defined in mpconfigport.h, from constants from ASF4.
+     * CIRCUITPY_INTERNAL_CONFIG_SIZE is size of an optional hidden config area, used currently
+     * for crystalless USB timing calibration.
+     * CIRCUITPY_INTERNAL_NVM_SIZE is the size of microntroller.nvm.
+     */
+    FLASH (rx) : ORIGIN = 0x00000000 + ${BOOTLOADER_SIZE}, LENGTH = ${FLASH_SIZE} - ${BOOTLOADER_SIZE} - ${CIRCUITPY_INTERNAL_CONFIG_SIZE} - ${CIRCUITPY_INTERNAL_NVM_SIZE}
+    RAM (xrw)  : ORIGIN = 0x20000000, LENGTH = ${RAM_SIZE}
+}
+
+/* top end of the stack */
+/* stack must be double-word (8 byte) aligned */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
+_bootloader_dbl_tap = ORIGIN(RAM) + LENGTH(RAM) - 4;
+
+/* define output sections */
+SECTIONS
+{
+    /* The program code and other data goes into FLASH */
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors)) /* isr vector table */
+        *(.text)           /* .text sections (code) */
+        *(.text*)          /* .text* sections (code) */
+        *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+        *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+
+        . = ALIGN(4);
+    } >FLASH
+
+    .ARM.exidx :
+    {
+        *(.ARM.exidx*)
+        *(.gnu.linkonce.armexidx.*)
+        _etext = .;        /* define a global symbol at end of code */
+        _sidata = .;       /* start of .data section */
+    } > FLASH
+
+    /* This is the initialized data section
+    The program executes knowing that the data is in the RAM
+    but the loader puts the initial values in the FLASH (inidata).
+    It is one task of the startup to copy the initial values from FLASH to RAM. */
+    .data : AT ( _sidata )
+    {
+        . = ALIGN(4);
+        _srelocate = .;        /* create a global symbol at data start; used by startup code in order to initialize the .data section in RAM */
+        *(.ramfunc)
+        *(.ramfunc*)
+        *(.data)           /* .data sections */
+        *(.data*)          /* .data* sections */
+
+        . = ALIGN(4);
+        _erelocate = .;        /* define a global symbol at data end; used by startup code in order to initialize the .data section in RAM */
+    } >RAM
+
+    /* Uninitialized data section */
+    .bss :
+    {
+        . = ALIGN(4);
+        _sbss = .;
+        _szero = .;         /* define a global symbol at bss start; used by startup code */
+        *(.bss)
+        *(.bss*)
+        *(COMMON)
+
+        . = ALIGN(4);
+        _ezero = .;         /* define a global symbol at bss end; used by startup code */
+        _ebss = .;
+    } >RAM
+
+    /* this just checks there is enough RAM for the requested stack. */
+    .stack :
+    {
+        . = ALIGN(4);
+        . = . + ${CIRCUITPY_DEFAULT_STACK_SIZE};
+        . = ALIGN(4);
+    } >RAM
+
+    .ARM.attributes 0 : { *(.ARM.attributes) }
+}

ports/atmel-samd/boards/cp32-m4/mpconfigboard.h

@@ -12,14 +12,6 @@
 #define MICROPY_PORT_C        (0)
 #define MICROPY_PORT_D        (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PB09)
 #define DEFAULT_I2C_BUS_SDA (&pin_PB08)
 

ports/atmel-samd/boards/cp32-m4/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x20-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8021
 USB_PRODUCT = "CP32-M4"

ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.h

@@ -20,14 +20,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define BOARD_HAS_CRYSTAL 1
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PB03)

ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x4097
 USB_PID = 0x0001
 USB_PRODUCT = "Datalore IP M4"

ports/atmel-samd/boards/datum_distance/mpconfigboard.h

@@ -10,10 +10,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)
 

ports/atmel-samd/boards/datum_distance/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x04D8
 USB_PID = 0xEE8C
 USB_PRODUCT = "datum-Distance"

ports/atmel-samd/boards/datum_imu/mpconfigboard.h

@@ -10,10 +10,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)
 

ports/atmel-samd/boards/datum_imu/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x04D8
 USB_PID = 0xEE8D
 USB_PRODUCT = "datum-IMU"

ports/atmel-samd/boards/datum_light/mpconfigboard.h

@@ -10,10 +10,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)
 

ports/atmel-samd/boards/datum_light/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x04D8
 USB_PID = 0xEE8E
 USB_PRODUCT = "datum-Light"

ports/atmel-samd/boards/datum_weather/mpconfigboard.h

@@ -10,10 +10,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)
 

ports/atmel-samd/boards/datum_weather/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x04D8
 USB_PID = 0xEE8F
 USB_PRODUCT = "datum-Weather"

ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h

@@ -8,12 +8,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.

ports/atmel-samd/boards/escornabot_makech/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x1209
 USB_PID = 0xBAB6
 USB_PRODUCT = "Escornabot Makech"

ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.h

@@ -8,10 +8,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA22)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA23)
 

ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x239A
 USB_PID = 0x8015
 USB_PRODUCT = "Feather M0 Adalogger"

ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.h

@@ -8,10 +8,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)
 

ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x239A
 USB_PID = 0x8015
 USB_PRODUCT = "Feather M0"

ports/atmel-samd/boards/feather_m0_express/mpconfigboard.h

@@ -15,13 +15,6 @@
 #define MICROPY_PORT_B        ( 0 )
 #define MICROPY_PORT_C        ( 0 )
 
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define BOARD_HAS_CRYSTAL 1
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)

ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8023
 USB_PRODUCT = "Feather M0 Express"

ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.h

@@ -15,12 +15,6 @@
 #define MICROPY_PORT_B        ( 0 )
 #define MICROPY_PORT_C        ( 0 )
 
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define BOARD_HAS_CRYSTAL 1
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)

ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8023
 USB_PRODUCT = "Feather M0 Express"

ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.h

@@ -8,10 +8,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)
 

ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x239A
 USB_PID = 0x8015
 USB_PRODUCT = "Feather M0 RFM69"

ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.h

@@ -8,10 +8,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)
 

ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x239A
 USB_PID = 0x8015
 USB_PRODUCT = "Feather M0 RFM9x"

ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.h

@@ -17,12 +17,6 @@
 #define MICROPY_PORT_B        ( 0 )
 #define MICROPY_PORT_C        ( 0 )
 
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)
 

ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8023
 USB_PRODUCT = "Feather M0 Supersized"

ports/atmel-samd/boards/feather_m4_express/mpconfigboard.h

@@ -16,14 +16,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define EXTERNAL_FLASH_QSPI_DUAL
 
 #define BOARD_HAS_CRYSTAL 1

ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8026
 USB_PRODUCT = "Feather M4 Express"

ports/atmel-samd/boards/feather_radiofruit_zigbee/mpconfigboard.h

@@ -14,12 +14,6 @@
 #define MICROPY_PORT_B        ( 0 )
 #define MICROPY_PORT_C        ( 0 )
 
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define BOARD_HAS_CRYSTAL 1
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PA13)

ports/atmel-samd/boards/feather_radiofruit_zigbee/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8023
 USB_PRODUCT = "Feather RadioFruit Zigbee"

ports/atmel-samd/boards/gemma_m0/mpconfigboard.h

@@ -10,16 +10,12 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA05)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA04)
 
 #define DEFAULT_UART_BUS_RX (&pin_PA05)
 #define DEFAULT_UART_BUS_TX (&pin_PA04)
 
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define IGNORE_PIN_PA03     1
 #define IGNORE_PIN_PA06     1
 #define IGNORE_PIN_PA07     1

ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x239A
 USB_PID = 0x801D
 USB_PRODUCT = "Gemma M0"

ports/atmel-samd/boards/grandcentral_m4_express/mpconfigboard.h

@@ -21,14 +21,6 @@
 #define MICROPY_PORT_C ( PORT_PC24 | PORT_PC30 | PORT_PC31 )
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define BOARD_HAS_CRYSTAL 1
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PB21)

ports/atmel-samd/boards/grandcentral_m4_express/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x20-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8032
 USB_PRODUCT = "Grand Central M4 Express"

ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.h

@@ -16,12 +16,6 @@
 #define MICROPY_PORT_B        ( PORT_PB22 | PORT_PB23 )
 #define MICROPY_PORT_C        ( 0 )
 
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA17)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA16)
 

ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0xD1ED
 USB_PRODUCT = "HalloWing M0 Express"

ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.h

@@ -16,14 +16,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA13)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA12)
 

ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x804A
 USB_PRODUCT = "Hallowing M4 Express"

ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.h

@@ -16,12 +16,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)
 

ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
 USB_VID = 0x239A
 USB_PID = 0x8012
 USB_PRODUCT = "ItsyBitsy M0 Express"
@@ -21,4 +20,3 @@ CIRCUITPY_RTC = 0
 
 CFLAGS_INLINE_LIMIT = 60
 SUPEROPT_GC = 0
-

ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.h

@@ -17,14 +17,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA13)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA12)
 

ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x802C
 USB_PRODUCT = "ItsyBitsy M4 Express"

ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h

@@ -14,8 +14,6 @@
 
 #define CIRCUITPY_INTERNAL_NVM_SIZE 0
 
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - 0x010000)
-
 #define DEFAULT_I2C_BUS_SCL  (&pin_PA17)
 #define DEFAULT_I2C_BUS_SDA  (&pin_PA16)
 

ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader.ld
 USB_VID = 0x04D8
 USB_PID = 0xED94
 USB_PRODUCT = "kicksat-sprite"

ports/atmel-samd/boards/meowmeow/mpconfigboard.h

@@ -8,12 +8,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.

ports/atmel-samd/boards/meowmeow/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x1209
 USB_PID = 0xBAB1
 USB_PRODUCT = "Meow Meow"

ports/atmel-samd/boards/metro_m0_express/mpconfigboard.h

@@ -21,12 +21,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define BOARD_HAS_CRYSTAL 1
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)

ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8014
 USB_PRODUCT = "Metro M0 Express"

ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.h

@@ -18,14 +18,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define BOARD_HAS_CRYSTAL 1
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PB03)

ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8038
 USB_PRODUCT = "Metro M4 Airlift Lite"

ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h

@@ -20,14 +20,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define BOARD_HAS_CRYSTAL 1
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PB03)

ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8021
 USB_PRODUCT = "Metro M4 Express"

ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.h

@@ -17,14 +17,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA13)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA12)
 

ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x1209
 USB_PID = 0x2017
 USB_PRODUCT = "Mini SAM M4"

ports/atmel-samd/boards/monster_m4sk/mpconfigboard.h

@@ -13,14 +13,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA01)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA00)
 

ports/atmel-samd/boards/monster_m4sk/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8048
 USB_PRODUCT = "Monster M4SK"

ports/atmel-samd/boards/pewpew10/mpconfigboard.h

@@ -5,11 +5,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
-
 #define IGNORE_PIN_PB00     1
 #define IGNORE_PIN_PB01     1
 #define IGNORE_PIN_PB02     1

ports/atmel-samd/boards/pewpew10/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x239A
 USB_PID = 0x801D
 USB_PRODUCT = "PewPew 10.2"

ports/atmel-samd/boards/pewpew_m4/mpconfigboard.h

@@ -9,14 +9,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA01)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA00)
 
@@ -48,4 +40,3 @@
 #define IGNORE_PIN_PB09     1
 #define IGNORE_PIN_PB10     1
 #define IGNORE_PIN_PB11     1
-

ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader.ld
 USB_VID = 0x1d50
 USB_PID = 0x60e8
 USB_PRODUCT = "PewPew M4"

ports/atmel-samd/boards/pirkey_m0/mpconfigboard.h

@@ -8,10 +8,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE  256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define IGNORE_PIN_PA02     1
 #define IGNORE_PIN_PA03     1
 #define IGNORE_PIN_PA04     1

ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x239A
 USB_PID = 0x8028
 USB_PRODUCT = "pIRKey M0"

ports/atmel-samd/boards/pybadge/mpconfigboard.h

@@ -14,14 +14,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA13)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA12)
 

ports/atmel-samd/boards/pybadge/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8034
 USB_PRODUCT = "PyBadge"

ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.h

@@ -14,14 +14,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA13)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA12)
 

ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8043
 USB_PRODUCT = "PyBadge AirLift"

ports/atmel-samd/boards/pygamer/mpconfigboard.h

@@ -13,14 +13,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA13)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA12)
 

ports/atmel-samd/boards/pygamer/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x803E
 USB_PRODUCT = "PyGamer"

ports/atmel-samd/boards/pygamer_advance/mpconfigboard.h

@@ -13,14 +13,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA13)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA12)
 

ports/atmel-samd/boards/pygamer_advance/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x803E
 USB_PRODUCT = "PyGamer Advance"

ports/atmel-samd/boards/pyportal/mpconfigboard.h

@@ -17,14 +17,6 @@
 #define MICROPY_PORT_C ( 0 )
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PB03)
 #define DEFAULT_I2C_BUS_SDA (&pin_PB02)
 

ports/atmel-samd/boards/pyportal/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x20-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8036
 USB_PRODUCT = "PyPortal"

ports/atmel-samd/boards/pyportal_titano/mpconfigboard.h

@@ -16,14 +16,6 @@
 #define MICROPY_PORT_C ( 0 )
 #define MICROPY_PORT_D (0)
 
-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PB03)
 #define DEFAULT_I2C_BUS_SDA (&pin_PB02)
 

ports/atmel-samd/boards/pyportal_titano/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x20-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8054
 USB_PRODUCT = "PyPortal Titano"

ports/atmel-samd/boards/pyruler/mpconfigboard.h

@@ -10,10 +10,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define IGNORE_PIN_PA12     1
 #define IGNORE_PIN_PA13     1
 #define IGNORE_PIN_PA16     1

ports/atmel-samd/boards/pyruler/mpconfigboard.mk

@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x239A
 USB_PID = 0x804C
 USB_PRODUCT = "PyRuler"

ports/atmel-samd/boards/robohatmm1_m0/mpconfigboard.h

@@ -17,13 +17,6 @@
 #define MICROPY_PORT_B        ( 0 )
 #define MICROPY_PORT_C        ( 0 )
 
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define CALIBRATE_CRYSTALLESS 1
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
@@ -39,4 +32,3 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
-