Fix emu-test-apps linker scripts

Author: danielinux

src/image.c

@@ -2202,7 +2202,7 @@ int wolfBoot_verify_authenticity(struct wolfBoot_image *img)
             wolfBoot_printf("Verification of hybrid signature\n");
             wolfBoot_verify_signature_secondary(key_slot, img,
                     stored_secondary_signature);
-	    (void)stored_secondary_signature_size;
+            (void)stored_secondary_signature_size;
             wolfBoot_printf("Done.\n");
         }
     }

test-app/emu-test-apps/mcxw71/target.ld.in

@@ -23,7 +23,7 @@
 MEMORY
 {
     FLASH (rx)  : ORIGIN = @FLASH_ORIGIN@, LENGTH = 0x000FFF00
-    RAM   (rwx) : ORIGIN = @FLASH_ORIGIN@, LENGTH = 0x0001C000
+    RAM   (rwx) : ORIGIN = 0x20010000,    LENGTH = 0x00006000
 }
 
 _estack = ORIGIN(RAM) + LENGTH(RAM);

test-app/emu-test-apps/nrf5340/target.ld.in

@@ -23,7 +23,7 @@
 MEMORY
 {
     FLASH (rx)  : ORIGIN = @FLASH_ORIGIN@, LENGTH = 0x000FFF00
-    RAM   (rwx) : ORIGIN = @FLASH_ORIGIN@, LENGTH = 0x00080000
+    RAM   (rwx) : ORIGIN = 0x20000000,    LENGTH = 0x00080000
 }
 
 _estack = ORIGIN(RAM) + LENGTH(RAM);

test-app/emu-test-apps/stm32h563/target.ld.in

@@ -23,7 +23,7 @@
 MEMORY
 {
     FLASH (rx)  : ORIGIN = @FLASH_ORIGIN@, LENGTH = 0x001FFF00
-    RAM   (rwx) : ORIGIN = @FLASH_ORIGIN@, LENGTH = 0x000A0000
+    RAM   (rwx) : ORIGIN = 0x20050000,    LENGTH = 0x00040000
 }
 
 _estack = ORIGIN(RAM) + LENGTH(RAM);

test-app/emu-test-apps/stm32h563/target_v8.ld

@@ -23,7 +23,7 @@
 MEMORY
 {
     FLASH (rx)  : ORIGIN = 0x8060100, LENGTH = 0x001FFF00
-    RAM   (rwx) : ORIGIN = 0x8060100, LENGTH = 0x000A0000
+    RAM   (rwx) : ORIGIN = 0x20050000, LENGTH = 0x00040000
 }
 
 _estack = ORIGIN(RAM) + LENGTH(RAM);

test-app/emu-test-apps/stm32l552/target.ld.in

@@ -23,7 +23,7 @@
 MEMORY
 {
     FLASH (rx)  : ORIGIN = @FLASH_ORIGIN@, LENGTH = 0x0007FF00
-    RAM   (rwx) : ORIGIN = @FLASH_ORIGIN@, LENGTH = 0x00040000
+    RAM   (rwx) : ORIGIN = 0x20020000,    LENGTH = 0x00020000
 }
 
 _estack = ORIGIN(RAM) + LENGTH(RAM);

test-app/emu-test-apps/stm32u585/target.ld.in

@@ -23,7 +23,7 @@
 MEMORY
 {
     FLASH (rx)  : ORIGIN = @FLASH_ORIGIN@, LENGTH = 0x001FFF00
-    RAM   (rwx) : ORIGIN = @FLASH_ORIGIN@, LENGTH = 0x000C0000
+    RAM   (rwx) : ORIGIN = 0x20040000,    LENGTH = 0x00080000
 }
 
 _estack = ORIGIN(RAM) + LENGTH(RAM);

test-app/emu-test-apps/test.sh

@@ -133,7 +133,8 @@ UPDATE_OFFSET_HEX=$(printf "0x%x" "$UPDATE_OFFSET")
 get_check_config_val() {
   local key="$1"
   local val
-  make -C "$WOLFBOOT_ROOT/tools/check_config" check_config RAM_CODE=0 >/dev/null
+  make -C "$WOLFBOOT_ROOT" include/target.h >/dev/null
+  make -C "$WOLFBOOT_ROOT/tools/check_config" check_config CROSS_COMPILE=arm-none-eabi- RAM_CODE=0 >/dev/null
   val="$("$WOLFBOOT_ROOT/tools/check_config/check_config" | grep -m1 "^${key}" | sed 's/.*: *//')"
   [[ -n "$val" ]] || die "missing ${key} from tools/check_config output"
   echo "0x$val"
@@ -187,6 +188,7 @@ REBOOT_TIMEOUT="${REBOOT_TIMEOUT:-10}"
 write_target_ld() {
   local tpl=""
   local base=""
+  local emu_tpl=""
   local addr
   local size
   addr=$((BOOT_ADDR + IMAGE_HEADER_SIZE))
@@ -201,6 +203,13 @@ write_target_ld() {
     *) die "unsupported TARGET for linker template: $TARGET" ;;
   esac
 
+  emu_tpl="$EMU_PATH/target.ld.in"
+  if [[ -f "$emu_tpl" ]]; then
+    sed -e "s/@FLASH_ORIGIN@/0x$(printf '%x' "$addr")/g" \
+        "$emu_tpl" > "$EMU_PATH/target.ld"
+    return 0
+  fi
+
   if [[ "${TZEN}" == "1" && -f "$WOLFBOOT_ROOT/test-app/${base}-ns.ld" ]]; then
     tpl="$WOLFBOOT_ROOT/test-app/${base}-ns.ld"
   else

tools/check_config/Makefile

@@ -3,6 +3,8 @@
 include ../config.mk
 include ../../options.mk
 
+CROSS_COMPILE?=
+CC?=$(CROSS_COMPILE)gcc
 CFLAGS+=-I. -I../../ -I../../include
 
 .PHONY: run clean
@@ -12,11 +14,11 @@ run:
 	$(Q)$(MAKE) check_config
 
 check_config: check_config.o
-	$(Q)gcc -o $@ $^ $(CFLAGS)
+	$(Q)$(CC) -o $@ $^ $(CFLAGS)
 	$(Q)./$@
 
 %.o:%.c
-	$(Q)gcc -c -o $@ $^ $(CFLAGS)
+	$(Q)$(CC) -c -o $@ $^ $(CFLAGS)
 
 clean:
 	$(Q)rm -f check_config *.o