diff --git a/atmel-samd/boards/cplay_m0_flash/mpconfigboard.h b/atmel-samd/boards/cplay_m0_flash/mpconfigboard.h
index 1db6c4b74a..c863da6e48 100644
--- a/atmel-samd/boards/cplay_m0_flash/mpconfigboard.h
+++ b/atmel-samd/boards/cplay_m0_flash/mpconfigboard.h
@@ -14,11 +14,11 @@
 #define SPI_FLASH_PAD1_PINMUX PINMUX_DEFAULT // CS
 #define SPI_FLASH_PAD2_PINMUX PINMUX_PB10D_SERCOM4_PAD2 // MOSI
 #define SPI_FLASH_PAD3_PINMUX PINMUX_PB11D_SERCOM4_PAD3 // SCK
-#define SPI_FLASH_CS          PIN_PB08
+#define SPI_FLASH_CS          PIN_PB22
 #define SPI_FLASH_SERCOM      SERCOM4
 
 #define MICROPY_PORT_A        (PORT_PA12 | PORT_PA24 | PORT_PA25)
-#define MICROPY_PORT_B        (PORT_PB08 | PORT_PB10 | PORT_PB11)
+#define MICROPY_PORT_B        (PORT_PB10 | PORT_PB11 | PORT_PB22)
 
 #define AUTORESET_DELAY_MS 500
 
diff --git a/atmel-samd/boards/cplay_m0_flash/mpconfigboard.mk b/atmel-samd/boards/cplay_m0_flash/mpconfigboard.mk
index 4b508957d1..8b6d61bbb4 100644
--- a/atmel-samd/boards/cplay_m0_flash/mpconfigboard.mk
+++ b/atmel-samd/boards/cplay_m0_flash/mpconfigboard.mk
@@ -1,4 +1,4 @@
-LD_FILE = boards/samd21x18-external-flash.ld
+LD_FILE = boards/samd21x18-bootloader-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8015