From 08810ab9180eed9891f229f4438c5e5a76d628e2 Mon Sep 17 00:00:00 2001
From: Arjan van Vught <arjan.van.vught@gmail.com>
Date: Mon, 26 Feb 2024 18:23:21 +0100
Subject: [PATCH] Removed -DBARE_METAL

---
 firmware-template-gd32/Board.mk     | 4 +++-
 firmware-template-gd32/Rules.mk     | 2 +-
 firmware-template-gd32/lib/Rules.mk | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/firmware-template-gd32/Board.mk b/firmware-template-gd32/Board.mk
index c09d300..eab9709 100644
--- a/firmware-template-gd32/Board.mk
+++ b/firmware-template-gd32/Board.mk
@@ -16,7 +16,7 @@ endif
 
 ifeq ($(strip $(BOARD)),BOARD_GD32F107RC)
 	MCU=GD32F107RC
-	DEFINES+=-DCONFIG_STORE_USE_SPI
+	DEFINES+=-DCONFIG_STORE_USE_ROM
 endif
 
 ifeq ($(strip $(BOARD)),BOARD_GD32F207RG)
@@ -68,10 +68,12 @@ endif
 
 ifeq ($(strip $(BOARD)),BOARD_GD32F470Z_EVAL)
 	MCU=GD32F470ZK
+	DEFINES+=-DCONFIG_STORE_USE_RAM
 endif
 
 ifeq ($(strip $(BOARD)),BOARD_GD32H759I_EVAL)
 	MCU=GD32H759IM
+	DEFINES+=-DCONFIG_STORE_USE_ROM
 endif
 
 ifeq ($(strip $(BOARD)),BOARD_BW_OPIDMX4)
diff --git a/firmware-template-gd32/Rules.mk b/firmware-template-gd32/Rules.mk
index d3c0904..8c55743 100644
--- a/firmware-template-gd32/Rules.mk
+++ b/firmware-template-gd32/Rules.mk
@@ -51,7 +51,7 @@ $(info $$DEFINES [${DEFINES}])
 $(info $$LIBS [${LIBS}])
 $(info $$LIBDEP [${LIBDEP}])
 
-COPS=-DBARE_METAL -DGD32 -D$(FAMILY_UCA) -D$(LINE_UC) -D$(MCU) -D$(BOARD)
+COPS=-DGD32 -D$(FAMILY_UCA) -D$(LINE_UC) -D$(MCU) -D$(BOARD)
 COPS+=$(strip $(DEFINES) $(MAKE_FLAGS) $(INCLUDES) $(LIBINCDIRS))
 COPS+=$(strip $(ARMOPS) $(CMSISOPS))
 COPS+=-Os -nostartfiles -ffreestanding -nostdlib
diff --git a/firmware-template-gd32/lib/Rules.mk b/firmware-template-gd32/lib/Rules.mk
index b9a7e91..b9c238d 100644
--- a/firmware-template-gd32/lib/Rules.mk
+++ b/firmware-template-gd32/lib/Rules.mk
@@ -27,7 +27,7 @@ INCLUDES+=-I../lib-configstore/include -I../lib-device/include -I../lib-display/
 $(info $$DEFINES [${DEFINES}])
 $(info $$MAKE_FLAGS [${MAKE_FLAGS}])
 
-COPS=-DBARE_METAL -DGD32 -D$(FAMILY_UCA) -D$(LINE_UC) -D$(MCU) -D$(BOARD)
+COPS=-DGD32 -D$(FAMILY_UCA) -D$(LINE_UC) -D$(MCU) -D$(BOARD)
 COPS+=$(strip $(DEFINES)) $(MAKE_FLAGS) $(INCLUDES)
 COPS+=$(strip $(ARMOPS) $(CMSISOPS))
 COPS+=-Os -nostartfiles -ffreestanding -nostdlib