summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Ruben Bakke <glennbakke@gmail.com>2020-07-23 23:11:14 +0200
committerDamien George <damien@micropython.org>2021-08-08 23:17:55 +1000
commitffc636de2f2e91e1fecfca1b4b2691a59d83a8eb (patch)
tree76f230148ff31bccb8cf023086f195d188479498
parent4f76f6618507c01a067d69cc5b9934fafe261e18 (diff)
nrf/boards: Set FROZEN_MANIFEST blank when SD present on nrf51 targets.
-rw-r--r--ports/nrf/boards/microbit/mpconfigboard.mk3
-rw-r--r--ports/nrf/boards/pca10000/mpconfigboard.mk4
-rw-r--r--ports/nrf/boards/pca10001/mpconfigboard.mk4
-rw-r--r--ports/nrf/boards/pca10028/mpconfigboard.mk4
-rw-r--r--ports/nrf/boards/pca10031/mpconfigboard.mk4
-rw-r--r--ports/nrf/boards/wt51822_s4at/mpconfigboard.mk4
6 files changed, 23 insertions, 0 deletions
diff --git a/ports/nrf/boards/microbit/mpconfigboard.mk b/ports/nrf/boards/microbit/mpconfigboard.mk
index 96f430071..d96044195 100644
--- a/ports/nrf/boards/microbit/mpconfigboard.mk
+++ b/ports/nrf/boards/microbit/mpconfigboard.mk
@@ -2,9 +2,12 @@ MCU_SERIES = m0
MCU_VARIANT = nrf51
MCU_SUB_VARIANT = nrf51822
SOFTDEV_VERSION = 8.0.0
+
ifneq ($(SD),)
LD_FILES += boards/microbit/custom_nrf51822_s110_microbit.ld
+FROZEN_MANIFEST ?=
endif
+
LD_FILES += boards/nrf51x22_256k_16k.ld
FLASHER = pyocd
diff --git a/ports/nrf/boards/pca10000/mpconfigboard.mk b/ports/nrf/boards/pca10000/mpconfigboard.mk
index c0cef5f3a..52b8df88b 100644
--- a/ports/nrf/boards/pca10000/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10000/mpconfigboard.mk
@@ -3,3 +3,7 @@ MCU_VARIANT = nrf51
MCU_SUB_VARIANT = nrf51822
SOFTDEV_VERSION = 8.0.0
LD_FILES += boards/nrf51x22_256k_16k.ld
+
+ifneq ($(SD),)
+FROZEN_MANIFEST ?=
+endif
diff --git a/ports/nrf/boards/pca10001/mpconfigboard.mk b/ports/nrf/boards/pca10001/mpconfigboard.mk
index c0cef5f3a..52b8df88b 100644
--- a/ports/nrf/boards/pca10001/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10001/mpconfigboard.mk
@@ -3,3 +3,7 @@ MCU_VARIANT = nrf51
MCU_SUB_VARIANT = nrf51822
SOFTDEV_VERSION = 8.0.0
LD_FILES += boards/nrf51x22_256k_16k.ld
+
+ifneq ($(SD),)
+FROZEN_MANIFEST ?=
+endif
diff --git a/ports/nrf/boards/pca10028/mpconfigboard.mk b/ports/nrf/boards/pca10028/mpconfigboard.mk
index b3c8f21ea..779276ca1 100644
--- a/ports/nrf/boards/pca10028/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10028/mpconfigboard.mk
@@ -3,3 +3,7 @@ MCU_VARIANT = nrf51
MCU_SUB_VARIANT = nrf51822
SOFTDEV_VERSION = 8.0.0
LD_FILES += boards/nrf51x22_256k_32k.ld
+
+ifneq ($(SD),)
+FROZEN_MANIFEST ?=
+endif
diff --git a/ports/nrf/boards/pca10031/mpconfigboard.mk b/ports/nrf/boards/pca10031/mpconfigboard.mk
index b3c8f21ea..779276ca1 100644
--- a/ports/nrf/boards/pca10031/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10031/mpconfigboard.mk
@@ -3,3 +3,7 @@ MCU_VARIANT = nrf51
MCU_SUB_VARIANT = nrf51822
SOFTDEV_VERSION = 8.0.0
LD_FILES += boards/nrf51x22_256k_32k.ld
+
+ifneq ($(SD),)
+FROZEN_MANIFEST ?=
+endif
diff --git a/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk b/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
index 515de07f5..61c36f21d 100644
--- a/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
+++ b/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
@@ -5,3 +5,7 @@ SOFTDEV_VERSION = 8.0.0
LD_FILES += boards/nrf51x22_256k_16k.ld
CFLAGS += -DBLUETOOTH_LFCLK_RC
+
+ifneq ($(SD),)
+FROZEN_MANIFEST ?=
+endif