Exclude stm32c0 (too small for clang) and stm32h5 (no ARMORED support)

Author: danielinux

.github/workflows/test-build.yml

@@ -79,10 +79,6 @@ jobs:
 
       - name: Install Clang
         if: |
-          inputs.config-file == './config/examples/stm32c0.config' ||
-          inputs.config-file == './config/examples/stm32c0-rsa2048.config' ||
-          inputs.config-file == './config/examples/stm32h5.config' ||
-          inputs.config-file == './config/examples/stm32h5-dualbank.config' ||
           inputs.config-file == './config/examples/stm32h7.config' ||
           inputs.config-file == './config/examples/stm32h7-octospi.config' ||
           inputs.config-file == './config/examples/stm32u5.config' ||
@@ -110,10 +106,6 @@ jobs:
 
       - name: Rebuild wolfboot with Clang
         if: |
-          inputs.config-file == './config/examples/stm32c0.config' ||
-          inputs.config-file == './config/examples/stm32c0-rsa2048.config' ||
-          inputs.config-file == './config/examples/stm32h5.config' ||
-          inputs.config-file == './config/examples/stm32h5-dualbank.config' ||
           inputs.config-file == './config/examples/stm32h7.config' ||
           inputs.config-file == './config/examples/stm32h7-octospi.config' ||
           inputs.config-file == './config/examples/stm32u5.config' ||

arch.mk

@@ -1300,7 +1300,7 @@ ifeq ($(USE_CLANG),1)
   CFLAGS+=-DWOLFSSL_NO_ATOMIC -DWOLFSSL_NO_ATOMICS
   CFLAGS+=-Wno-unknown-attributes -Wno-error=unknown-attributes
   CFLAGS+=-fno-unwind-tables -fno-asynchronous-unwind-tables
-  LSCRIPT_FLAGS+=-T hal/clang-discard.ld
+  LSCRIPT_FLAGS+=-T $(abspath $(WOLFBOOT_ROOT)/hal/clang-discard.ld)
 endif
 
 ifeq ($(USE_GCC),1)

options.mk

@@ -12,6 +12,9 @@ ifeq ($(USE_CLANG),1)
   ifeq ($(USE_GCC),1)
     $(error USE_CLANG=1 is incompatible with USE_GCC=1; set USE_GCC=0)
   endif
+  ifeq ($(ARMORED),1)
+    $(error USE_CLANG=1 requires ARMORED=0)
+  endif
 endif
 
 # Support for Built-in ROT into OTP flash memory

test-app/Makefile

@@ -109,7 +109,6 @@ ifeq ($(USE_CLANG),1)
   # objcopy output then expands the flash-to-RAM gap into a huge sparse image.
   # The app image only needs the flash-backed output sections.
   OBJCOPY_IMAGE_FLAGS+=-j .text -j .edidx
-  LDFLAGS+=-T ../hal/clang-discard.ld
 endif
 
 ifeq ($(DEBUG_UART),1)
@@ -947,7 +946,7 @@ ifeq ($(ELF_FLASH_SCATTER),1)
 SQUASHELF_TOOL = ../tools/squashelf/squashelf
 image-orig.elf: $(APP_OBJS) $(LSCRIPT)
 	@echo "\t[LD] $@"
-	$(Q)$(LD) $(LDFLAGS) $(APP_OBJS) $(LIBS) $(OUTPUT_FLAG) $@
+	$(Q)$(LD) $(LDFLAGS) $(LSCRIPT_FLAGS) $(APP_OBJS) $(LIBS) $(OUTPUT_FLAG) $@
 
 image.elf: image-orig.elf
 	@echo "\t[SQUASHELF] $@"
@@ -956,7 +955,7 @@ else
 # Default behavior when ELF_FLASH_SCATTER is not set
 image.elf: $(APP_OBJS) $(LSCRIPT)
 	@echo "\t[LD] $@"
-	$(Q)$(LD) $(LDFLAGS) $(APP_OBJS) $(LIBS) $(OUTPUT_FLAG) $@
+	$(Q)$(LD) $(LDFLAGS) $(LSCRIPT_FLAGS) $(APP_OBJS) $(LIBS) $(OUTPUT_FLAG) $@
 endif
 
 standalone: image.bin