8000 Merge pull request #1687 from jrcutler/master · unixjazz/circuitpython@df79e9a · GitHub
[go: up one dir, main page]
Skip to content

Commit df79e9a

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#1687 from jrcutler/master
Enable nvm storage for all samd21x18 boards
2 parents 83f5414 + 41f4f26 commit df79e9a

File tree

17 files changed

+35
-32
lines changed

17 files changed

+35
-32
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
#define MICROPY_HW_LED_STATUS (&pin_PB23)
99

10-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
10+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
1111

12-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
12+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1313

1414
#define DEFAULT_I2C_BUS_SCL (&pin_PA09)
1515
#define DEFAULT_I2C_BUS_SDA (&pin_PA08)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#define MICROPY_PORT_B (0)
66
#define MICROPY_PORT_C (0)
77

8-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
8+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
99

10-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
10+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1111

1212
#define DEFAULT_I2C_BUS_SCL (&pin_PA09)
1313
#define DEFAULT_I2C_BUS_SDA (&pin_PA08)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#define MICROPY_PORT_B (PORT_PB03)
1111
#define MICROPY_PORT_C (0)
1212

13-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
13+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
1414

15-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
15+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1616

1717
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
1818
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
#define MICROPY_PORT_B (0)
88
#define MICROPY_PORT_C (0)
99

10-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
10+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
1111

1212
#define DEFAULT_SPI_BUS_SCK (&pin_PA19)
1313
#define DEFAULT_SPI_BUS_MOSI (&pin_PA18)
1414
#define DEFAULT_SPI_BUS_MISO (&pin_PA22)
1515

16-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
16+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1717

1818
#define IGNORE_PIN_PA00 1
1919
#define IGNORE_PIN_PA01 1

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ CIRCUITPY_SMALL_BUILD = 1
1010

1111
CHIP_VARIANT = SAMD21E18A
1212
CHIP_FAMILY = samd21
13+
14+
CIRCUITPY_FREQUENCYIO = 0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#define MICROPY_PORT_B (0)
99
#define MICROPY_PORT_C (0)
1010

11-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
11+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
1212

13-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
13+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1414

1515
#define DEFAULT_I2C_BUS_SCL (&pin_PA22)
1616
#define DEFAULT_I2C_BUS_SDA (&pin_PA23)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#define MICROPY_PORT_B (0)
99
#define MICROPY_PORT_C (0)
1010

11-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
11+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
1212

13-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
13+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1414

1515
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
1616
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#define MICROPY_PORT_B (0)
99
#define MICROPY_PORT_C (0)
1010

11-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
11+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
1212

13-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
13+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1414

1515
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
1616
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#define MICROPY_PORT_B (0)
99
#define MICROPY_PORT_C (0)
1010

11-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
11+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
1212

13-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
13+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1414

1515
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
1616
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
#define MICROPY_PORT_B (0)
1313
#define MICROPY_PORT_C (0)
1414

15-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
15+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
1616

1717
#define DEFAULT_I2C_BUS_SCL (&pin_PA05)
1818
#define DEFAULT_I2C_BUS_SDA (&pin_PA04)
1919

2020
#define DEFAULT_UART_BUS_RX (&pin_PA05)
2121
#define DEFAULT_UART_BUS_TX (&pin_PA04)
2222

23-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
23+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
2424

2525
#define IGNORE_PIN_PA03 1
2626
#define IGNORE_PIN_PA06 1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
// If you change this, then make sure to update the linker scripts as well to
1212
// make sure you don't overwrite code.
13-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
13+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
1414

15-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
15+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1616

1717
#define CALIBRATE_CRYSTALLESS 1
1818

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#define MICROPY_PORT_B (0)
66
#define MICROPY_PORT_C (0)
77

8-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
8+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
99

10-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
10+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1111

1212

1313
#define IGNORE_PIN_PB00 1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#define MICROPY_PORT_B (0)
1111
#define MICROPY_PORT_C (0)
1212

13-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
13+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
1414

15-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
15+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1616

1717
#define IGNORE_PIN_PA02 1
1818
#define IGNORE_PIN_PA03 1

‎ports/atmel-samd/boards/samd21x18-bootloader.ld

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
/* Specify the memory areas */
66
MEMORY
77
{
8-
/* Leave 8KiB for the bootloader, and 64k for the flash file system. */
9-
FLASH (rx) : ORIGIN = 0x00000000 + 8K, LENGTH = 256K - 8K - 64K
8+
/* Leave 8KiB for the bootloader, 64k for the flash file system, and 256b
9+
for user config. */
10+
FLASH (rx) : ORIGIN = 0x00000000 + 8K, LENGTH = 256K - 8K - 64K - 256
1011
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 32K
1112
}
1213

‎ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#define MICROPY_PORT_B (0)
66
#define MICROPY_PORT_C (0)
77

8-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
8+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
99

10-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
10+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1111

1212
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
1313
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)

‎ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#define MICROPY_PORT_B (0)
66
#define MICROPY_PORT_C (0)
77

8-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
8+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
99

10-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
10+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1111

1212
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
1313
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)

‎ports/atmel-samd/boards/trinket_m0/mpconfigboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#define MICROPY_PORT_B (0)
1212
#define MICROPY_PORT_C (0)
1313

14-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
14+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
1515

16-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
16+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1717

1818
#define IGNORE_PIN_PA03 1
1919
#define IGNORE_PIN_PA04 1

0 commit comments

Comments
 (0)
0