diff --git a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.h b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.h
index e58dfa2fd3..592160b84f 100755
--- a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.h
@@ -5,8 +5,6 @@
 
 #define MICROPY_HW_LED_STATUS   (&pin_PA14)
 
-#define SPI_FLASH_BAUDRATE  (8000000)
-
 // On-board flash
 #define SPI_FLASH_MOSI_PIN          &pin_PA16
 #define SPI_FLASH_MISO_PIN          &pin_PA18
@@ -18,11 +16,7 @@
 #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 SPI_FLASH_BAUDRATE  (8000000)
 
 #define CALIBRATE_CRYSTALLESS 1
 
diff --git a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
index 0e75efd082..3587f1a33b 100755
--- a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
@@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
 USB_VID = 0x04D8
 USB_PID = 0xEC63
 USB_PRODUCT = "CircuitBrains Basic"
@@ -14,4 +13,4 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
\ No newline at end of file
+CIRCUITPY_I2CSLAVE = 0
diff --git a/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.h b/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.h
index 6a9dc8ebe9..687e97a5a3 100755
--- a/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.h
@@ -15,12 +15,6 @@
 
 #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)
@@ -35,4 +29,4 @@
 
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
-#define IGNORE_PIN_PA25     1
\ No newline at end of file
+#define IGNORE_PIN_PA25     1
diff --git a/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.mk b/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.mk
index 2dcfed1f67..7a9e5a7808 100755
--- a/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.mk
@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x04D8
 USB_PID = 0xEC64
 USB_PRODUCT = "CircuitBrains Deluxe"
@@ -14,4 +13,4 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_NETWORK = 1
 MICROPY_PY_WIZNET5K = 5500
-CIRCUITPY_PS2IO = 1
\ No newline at end of file
+CIRCUITPY_PS2IO = 1