From d9a312c9e06038067003fbe201b604e668b05e3e Mon Sep 17 00:00:00 2001
From: Jake Carter <jhcarter.co@gmail.com>
Date: Wed, 11 Sep 2024 20:04:04 -0600
Subject: [PATCH] Force RISC-V dependency re-evaluation for RISC-V loader

---
 Libraries/CMSIS/Device/Maxim/MAX32655/Source/GCC/max32655.mk | 2 +-
 Libraries/CMSIS/Device/Maxim/MAX32680/Source/GCC/max32680.mk | 2 +-
 Libraries/CMSIS/Device/Maxim/MAX32690/Source/GCC/max32690.mk | 2 +-
 Libraries/CMSIS/Device/Maxim/MAX78000/Source/GCC/max78000.mk | 2 +-
 Libraries/CMSIS/Device/Maxim/MAX78002/Source/GCC/max78002.mk | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Libraries/CMSIS/Device/Maxim/MAX32655/Source/GCC/max32655.mk b/Libraries/CMSIS/Device/Maxim/MAX32655/Source/GCC/max32655.mk
index a918cc4a9e6..2f4ca126294 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32655/Source/GCC/max32655.mk
+++ b/Libraries/CMSIS/Device/Maxim/MAX32655/Source/GCC/max32655.mk
@@ -107,7 +107,7 @@ PROJ_OBJS = ${RISCV_APP_OBJ}
 .PHONY: rvapp
 rvapp: $(RISCV_APP_BIN)
 
-$(RISCV_APP_BIN):
+$(RISCV_APP_BIN): FORCE
 	$(MAKE) -C ${RISCV_APP} BUILD_DIR=$(RISCV_BUILD_DIR) RISCV_CORE=1 RISCV_LOAD=0 PROJECT=riscv HOST_PROJECT=$(PROJECT)
 	$(MAKE) -C ${RISCV_APP} BUILD_DIR=$(RISCV_BUILD_DIR) $(RISCV_APP_BIN) RISCV_CORE=1 RISCV_LOAD=0
 
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32680/Source/GCC/max32680.mk b/Libraries/CMSIS/Device/Maxim/MAX32680/Source/GCC/max32680.mk
index 2ef776e1e2e..d0b606db459 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32680/Source/GCC/max32680.mk
+++ b/Libraries/CMSIS/Device/Maxim/MAX32680/Source/GCC/max32680.mk
@@ -107,7 +107,7 @@ PROJ_OBJS = ${RISCV_APP_OBJ}
 .PHONY: rvapp
 rvapp: $(RISCV_APP_BIN)
 
-$(RISCV_APP_BIN):
+$(RISCV_APP_BIN): FORCE
 	$(MAKE) -C ${RISCV_APP} BUILD_DIR=$(RISCV_BUILD_DIR) RISCV_CORE=1 RISCV_LOAD=0 PROJECT=riscv
 	$(MAKE) -C ${RISCV_APP} BUILD_DIR=$(RISCV_BUILD_DIR) $(RISCV_APP_BIN) RISCV_CORE=1 RISCV_LOAD=0
 
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32690/Source/GCC/max32690.mk b/Libraries/CMSIS/Device/Maxim/MAX32690/Source/GCC/max32690.mk
index 279bdfc9f5d..b51c60991e9 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32690/Source/GCC/max32690.mk
+++ b/Libraries/CMSIS/Device/Maxim/MAX32690/Source/GCC/max32690.mk
@@ -109,7 +109,7 @@ PROJ_OBJS = ${RISCV_APP_OBJ}
 .PHONY: rvapp
 rvapp: $(RISCV_APP_BIN)
 
-$(RISCV_APP_BIN):
+$(RISCV_APP_BIN): FORCE
 	$(MAKE) -C ${RISCV_APP} BUILD_DIR=$(RISCV_BUILD_DIR) RISCV_CORE=1 RISCV_LOAD=0 PROJECT=riscv
 	$(MAKE) -C ${RISCV_APP} BUILD_DIR=$(RISCV_BUILD_DIR) $(RISCV_APP_BIN) RISCV_CORE=1 RISCV_LOAD=0
 
diff --git a/Libraries/CMSIS/Device/Maxim/MAX78000/Source/GCC/max78000.mk b/Libraries/CMSIS/Device/Maxim/MAX78000/Source/GCC/max78000.mk
index 142e8af2db1..d874285739f 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX78000/Source/GCC/max78000.mk
+++ b/Libraries/CMSIS/Device/Maxim/MAX78000/Source/GCC/max78000.mk
@@ -191,7 +191,7 @@ endif
 .PHONY: rvapp
 rvapp: $(RISCV_APP_BIN)
 
-$(RISCV_APP_BIN): $(RISCV_COMMON_LD)
+$(RISCV_APP_BIN): $(RISCV_COMMON_LD) FORCE
 # Build the RISC-V project
 	@$(MAKE) -C ${RISCV_APP} BUILD_DIR=$(RISCV_BUILD_DIR) RISCV_CORE=1 RISCV_LOAD=0 PROJECT=riscv HOST_PROJECT=$(PROJECT) PROJ_LDFLAGS="$(PROJ_LDFLAGS)"
 # Create the binary (should incrementally build off of the first pass for the .elf)
diff --git a/Libraries/CMSIS/Device/Maxim/MAX78002/Source/GCC/max78002.mk b/Libraries/CMSIS/Device/Maxim/MAX78002/Source/GCC/max78002.mk
index 7d5e58fd38c..eb66c0234d0 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX78002/Source/GCC/max78002.mk
+++ b/Libraries/CMSIS/Device/Maxim/MAX78002/Source/GCC/max78002.mk
@@ -188,7 +188,7 @@ endif
 .PHONY: rvapp
 rvapp: $(RISCV_APP_BIN)
 
-$(RISCV_APP_BIN): $(RISCV_COMMON_LD)
+$(RISCV_APP_BIN): $(RISCV_COMMON_LD) FORCE
 # Build the RISC-V project
 	@$(MAKE) -C ${RISCV_APP} BUILD_DIR=$(RISCV_BUILD_DIR) RISCV_CORE=1 RISCV_LOAD=0 PROJECT=riscv HOST_PROJECT=$(PROJECT) PROJ_LDFLAGS="$(PROJ_LDFLAGS)"
 # Create the binary (should incrementally build off of the first pass for the .elf)