Skip to content

Commit eba10ea

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#764 from tannewt/nvm3
Turn on nvm in 3.0.
2 parents 10eabf6 + 5af4e79 commit eba10ea

24 files changed

Lines changed: 55 additions & 125 deletions

File tree

‎ports/atmel-samd/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,8 @@ SRC_COMMON_HAL = \
285285
analogio/__init__.c \
286286
analogio/AnalogIn.c \
287287
analogio/AnalogOut.c \
288+
nvm/__init__.c \
289+
nvm/ByteArray.c \
288290
pulseio/__init__.c \
289291
pulseio/PulseIn.c \
290292
pulseio/PulseOut.c \
@@ -293,9 +295,7 @@ SRC_COMMON_HAL = \
293295
usb_hid/Device.c \
294296
audioio/__init__.c \
295297
audioio/AudioOut.c \
296-
# nvm/__init__.c \
297-
audiobusio/PDMIn.c \
298-
nvm/ByteArray.c \
298+
# audiobusio/PDMIn.c \
299299
touchio/__init__.c \
300300
touchio/TouchIn.c \
301301

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242

4343
// If you change this, then make sure to update the linker scripts as well to
4444
// make sure you don't overwrite code.
45-
// #define CIRCUITPY_INTERNAL_NVM_SIZE 256
46-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
45+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
4746

4847
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
4948

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535

3636
// If you change this, then make sure to update the linker scripts as well to
3737
// make sure you don't overwrite code.
38-
// #define CIRCUITPY_INTERNAL_NVM_SIZE 256
39-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
38+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
4039

4140
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
4241

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737

3838
// If you change this, then make sure to update the linker scripts as well to
3939
// make sure you don't overwrite code.
40-
// #define CIRCUITPY_INTERNAL_NVM_SIZE 256
41-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
40+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
4241

4342
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
4443

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919

2020
// If you change this, then make sure to update the linker scripts as well to
2121
// make sure you don't overwrite code
22-
// #define CIRCUITPY_INTERNAL_NVM_SIZE 256
23-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
22+
#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
2423

2524
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
2625

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535

3636
// If you change this, then make sure to update the linker scripts as well to
3737
// make sure you don't overwrite code.
38-
// #define CIRCUITPY_INTERNAL_NVM_SIZE 256
39-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
38+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
39+
4040
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
4141

4242
#include "external_flash/devices.h"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919

2020
// If you change this, then make sure to update the linker scripts as well to
2121
// make sure you don't overwrite code
22-
// #define CIRCUITPY_INTERNAL_NVM_SIZE 256
23-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
22+
#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
2423

2524
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
2625

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636

3737
// If you change this, then make sure to update the linker scripts as well to
3838
// make sure you don't overwrite code.
39-
// #define CIRCUITPY_INTERNAL_NVM_SIZE 256
40-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
39+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
4140

4241
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
4342

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222

2323
// If you change this, then make sure to update the linker scripts as well to
2424
// make sure you don't overwrite code
25-
// #define CIRCUITPY_INTERNAL_NVM_SIZE 256
26-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
25+
#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
2726

2827
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
2928

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949

5050
// If you change this, then make sure to update the linker scripts as well to
5151
// make sure you don't overwrite code
52-
// #define CIRCUITPY_INTERNAL_NVM_SIZE 256
53-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
52+
#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
5453

5554
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
5655

0 commit comments

Comments
 (0)