From ffc636de2f2e91e1fecfca1b4b2691a59d83a8eb Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 23:11:14 +0200
Subject: [PATCH] nrf/boards: Set FROZEN_MANIFEST blank when SD present on
 nrf51 targets.

---
 ports/nrf/boards/microbit/mpconfigboard.mk     | 3 +++
 ports/nrf/boards/pca10000/mpconfigboard.mk     | 4 ++++
 ports/nrf/boards/pca10001/mpconfigboard.mk     | 4 ++++
 ports/nrf/boards/pca10028/mpconfigboard.mk     | 4 ++++
 ports/nrf/boards/pca10031/mpconfigboard.mk     | 4 ++++
 ports/nrf/boards/wt51822_s4at/mpconfigboard.mk | 4 ++++
 6 files changed, 23 insertions(+)

diff --git a/ports/nrf/boards/microbit/mpconfigboard.mk b/ports/nrf/boards/microbit/mpconfigboard.mk
index 96f430071b..d96044195e 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 c0cef5f3af..52b8df88b7 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 c0cef5f3af..52b8df88b7 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 b3c8f21ea9..779276ca1c 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 b3c8f21ea9..779276ca1c 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 515de07f5b..61c36f21d9 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