Fix linker warnings when building with otp

Author: danielinux

Makefile

@@ -26,10 +26,10 @@ SIGN_ALG=
 OBJCOPY_FLAGS=
 
 OBJS:= \
-	./hal/$(TARGET).o \
 	./src/string.o \
 	./src/image.o \
-	./src/libwolfboot.o
+	./src/libwolfboot.o \
+	./hal/$(TARGET).o
 
 ifeq ($(SIGN),NONE)
   PRIVATE_KEY=
@@ -85,50 +85,50 @@ TARGET_H_TEMPLATE:=include/target.h.in
 ifeq ($(TZEN),1)
 ifeq ($(TARGET),stm32l5)
 	# Don't build a contiguous image
-	MAIN_TARGET:=wolfboot.bin test-app/image_v1_signed.bin
+    MAIN_TARGET:=wolfboot.bin test-app/image_v1_signed.bin
 endif
 
 ifeq ($(TARGET),stm32u5)
 	# Don't build a contiguous image
-	MAIN_TARGET:=wolfboot.bin test-app/image_v1_signed.bin
+    MAIN_TARGET:=wolfboot.bin test-app/image_v1_signed.bin
 endif
 
 ifeq ($(TARGET),stm32h5)
 	# Don't build a contiguous image
-	MAIN_TARGET:=wolfboot.bin test-app/image_v1_signed.bin
+    MAIN_TARGET:=wolfboot.bin test-app/image_v1_signed.bin
 endif
 endif # TZEN=1
 
 ifeq ($(TARGET),x86_64_efi)
-	MAIN_TARGET:=wolfboot.efi
+    MAIN_TARGET:=wolfboot.efi
 endif
 
 ifeq ($(FSP), 1)
-	MAIN_TARGET:=wolfboot_stage1.bin
+    MAIN_TARGET:=wolfboot_stage1.bin
 endif
 
 ifeq ($(TARGET),library)
-	CFLAGS+=-g
-	MAIN_TARGET:=test-lib
+    CFLAGS+=-g
+    MAIN_TARGET:=test-lib
 endif
 
 ifeq ($(TARGET),raspi3)
-	MAIN_TARGET:=wolfboot.bin
+    MAIN_TARGET:=wolfboot.bin
 endif
 
 ifeq ($(TARGET),sim)
-	MAIN_TARGET:=wolfboot.bin tools/bin-assemble/bin-assemble test-app/image_v1_signed.bin internal_flash.dd
+    MAIN_TARGET:=wolfboot.bin tools/bin-assemble/bin-assemble test-app/image_v1_signed.bin internal_flash.dd
 endif
 
 ifeq ($(TARGET),nxp_p1021)
-	MAIN_TARGET:=factory_wstage1.bin
+    MAIN_TARGET:=factory_wstage1.bin
 endif
 ifeq ($(TARGET),nxp_t1024)
-	MAIN_TARGET:=factory_wstage1.bin
+    MAIN_TARGET:=factory_wstage1.bin
 endif
 
 ifeq ($(FLASH_OTP_KEYSTORE),1)
-	MAIN_TARGET:=include/target.h tools/keytools/otp/otp-keystore-primer factory.bin
+    MAIN_TARGET+=tools/keytools/otp/otp-keystore-primer.bin
 endif
 
 ASFLAGS:=$(CFLAGS)
@@ -177,11 +177,14 @@ standalone:
 	$(Q)$(OBJCOPY) $(OBJCOPY_FLAGS) -O binary test-app/image.elf standalone.bin
 	$(Q)$(SIZE) test-app/image.elf
 
+
 include tools/test.mk
 include tools/test-enc.mk
 include tools/test-delta.mk
 include tools/test-renode.mk
 
+hal/$(TARGET).o:
+
 keytools_check: keytools FORCE
 
 $(PRIVATE_KEY):
@@ -367,7 +370,7 @@ cppcheck:
 		--suppress="objectIndex" --suppress="comparePointers" \
 		--error-exitcode=89 --std=c89 src/*.c hal/*.c hal/spi/*.c hal/uart/*.c
 
-otp: tools/keytools/otp/otp-keystore-primer.bin
+otp: tools/keytools/otp/otp-keystore-primer.bin FORCE
 
 tools/keytools/otp/otp-keystore-primer.bin: FORCE
 	make -C tools/keytools/otp clean

include/wolfboot/wolfboot.h

@@ -177,7 +177,7 @@ extern "C" {
 
 #endif
 
-#if defined __WOLFBOOT || defined __FLASH_OTP_PRIMER
+#if defined(__WOLFBOOT) || defined (__FLASH_OTP_PRIMER)
 
  /* Authentication configuration */
  #if defined(WOLFBOOT_NO_SIGN)

tools/keytools/otp/Makefile

@@ -2,6 +2,10 @@
 -include ../../../tools/config.mk
 -include ../../../options.mk
 -include ../../../wcs/pkcs11.mk
+V?=0
+ifeq ($(V),0)
+  Q=@
+endif
 
 TARGET?=none
 ARCH?=ARM
@@ -28,14 +32,18 @@ CC=$(CROSS_COMPILE)gcc
 OBJCOPY?=$(CROSS_COMPILE)objcopy
 SIZE?=$(CROSS_COMPILE)size
 
-
 otp-keystore-primer.bin: otp-keystore-primer.elf
-	@$(OBJCOPY) -O binary $(^) $(@)
+	$(Q)$(OBJCOPY) -O binary $(^) $(@)
 
 otp-keystore-primer.elf: $(PRI_KS_OBJS)
-	@$(CC) -o otp-keystore-primer.elf $(LDFLAGS) $(CFLAGS) $(PRI_KS_OBJS)
-	@$(SIZE) $(@)
+	$(Q)$(CC) -o otp-keystore-primer.elf $(LDFLAGS) $(CFLAGS) $(PRI_KS_OBJS)
+	$(Q)$(SIZE) $(@)
+
+%.o: %.c
+	$(Q)$(CC) $(CFLAGS) -c -o $@ $<
+
+
 
 
 clean:
-	@rm -rf $(PRI_KS_OBJS) *.bin *.elf
+	$(Q)rm -rf $(PRI_KS_OBJS) *.bin *.elf

tools/keytools/otp/target.ld

@@ -4,6 +4,7 @@ MEMORY
     RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00020000 /* mapping Low-memory only */
 }
 
+ENTRY(isr_reset);
 SECTIONS
 {
     .text :