make: treat empty LSCRIPT_IN as unset at every target default

Copilot review follow-up: ?= considers a defined-but-empty LSCRIPT_IN
(stale LSCRIPT_IN?= line in .config, exported empty env var) already
set, so it skipped every target-specific default and fell through to
the last-resort hal/$(TARGET).ld - e.g. TARGET=stm32l5 TZEN=0 lost its
hal/stm32l5-ns.ld layout. The strip-based last-resort check only fixed
that one line, not the 32 target sites.

Add the LSCRIPT_IN_DEFAULT helper in tools/config.mk (assigns only when
LSCRIPT_IN is undefined or empty) and convert all 29 arch.mk, 2
board.mk and 1 stage1/Makefile sites to it.

Author: danielinux

Makefile

@@ -39,8 +39,10 @@ SECURE_LDFLAGS:=
 LD_START_GROUP:=-Wl,--start-group
 LD_END_GROUP:=-Wl,--end-group
 # Linker script: capture the user value (command line, environment, .config)
-# here; target defaults in arch.mk/options.mk/board.mk use ?= so a user
-# value wins. Last-resort default is applied after options.mk below.
+# here; target defaults in arch.mk/options.mk/board.mk use the
+# LSCRIPT_IN_DEFAULT helper (see tools/config.mk), which only assigns when
+# LSCRIPT_IN is undefined or empty, so a user value wins. Last-resort
+# default is applied after options.mk below.
 LSCRIPT_IN_USER:=$(LSCRIPT_IN)
 L2SRAM_ADDR?=0xF8F00000
 V?=0

arch.mk

@@ -109,7 +109,7 @@ ifeq ($(ARCH),AARCH64)
       ZYNQMP_PSU_INIT_DIR?=hal/board/zynqmp
       CFLAGS+=-DWOLFBOOT_ZYNQMP_FSBL
       CFLAGS+=-Ihal/zynqmp -I$(ZYNQMP_PSU_INIT_DIR)
-      LSCRIPT_IN?=hal/zynqmp_ocm.ld
+      $(call LSCRIPT_IN_DEFAULT,hal/zynqmp_ocm.ld)
       OBJS+=hal/zynqmp_psu_shim.o
       OBJS+=hal/zynqmp_atf.o
       OBJS+=$(ZYNQMP_PSU_INIT_DIR)/psu_init_gpl.o
@@ -510,7 +510,7 @@ ifeq ($(ARCH),ARM)
     SPI_TARGET=stm32
     # Partition trailers in sectors 1-2, see hal/stm32f4.c
     ifeq ($(CUSTOM_PARTITION_TRAILER),1)
-      LSCRIPT_IN?=hal/stm32f4-trailer.ld
+      $(call LSCRIPT_IN_DEFAULT,hal/stm32f4-trailer.ld)
     endif
   endif
 
@@ -682,7 +682,7 @@ ifeq ($(ARCH),ARM)
       WOLFBOOT_ORIGIN=0x0C000000
     else
       WOLFBOOT_ORIGIN=0x08000000
-      LSCRIPT_IN?=hal/$(TARGET)-ns.ld
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-ns.ld)
     endif
   endif
 
@@ -694,7 +694,7 @@ ifeq ($(ARCH),ARM)
       WOLFBOOT_ORIGIN=0x0C000000
     else
       WOLFBOOT_ORIGIN=0x08000000
-      LSCRIPT_IN?=hal/$(TARGET)-ns.ld
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-ns.ld)
     endif
     SPI_TARGET=stm32
   endif
@@ -704,7 +704,7 @@ ifeq ($(ARCH),ARM)
     CFLAGS+=-Ihal
     ARCH_FLASH_OFFSET=0x08000000
     WOLFBOOT_ORIGIN=0x08000000
-    LSCRIPT_IN?=hal/$(TARGET).ld
+    $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET).ld)
     SPI_TARGET=stm32
   endif
 
@@ -713,7 +713,7 @@ ifeq ($(ARCH),ARM)
     CFLAGS+=-Ihal
     ARCH_FLASH_OFFSET=0x08000000
     WOLFBOOT_ORIGIN=0x08000000
-    LSCRIPT_IN?=hal/$(TARGET).ld
+    $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET).ld)
     SPI_TARGET=stm32
   endif
 
@@ -724,7 +724,7 @@ ifeq ($(ARCH),ARM)
     # reached through the Secure SBUS alias, which the HAL derives from it.
     ARCH_FLASH_OFFSET=0x12000000
     WOLFBOOT_ORIGIN=0x12000000
-    LSCRIPT_IN?=hal/$(TARGET).ld
+    $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET).ld)
     SPI_TARGET=psoc_c3
     # Board wiring. Defaults match the PSOC Control C3 evaluation kit; override
     # for another variant.
@@ -782,13 +782,13 @@ ifeq ($(ARCH),ARM)
       BOOTLOADER_PARTITION_SIZE=$$(( ($(WOLFBOOT_PARTITION_BOOT_ADDRESS) | 0x10000000) - $(WOLFBOOT_ORIGIN) - 0x40))
     endif
     ifeq ($(TZEN),1)
-      LSCRIPT_IN?=hal/$(TARGET)-tz.ld
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-tz.ld)
       OBJS+=hal/psoc_e8_tz.o
       # wolfHSM NVM in the RRAM user area, Secure.
       WOLFBOOT_KEYVAULT_ADDRESS?=0x32040000
       WOLFBOOT_KEYVAULT_SIZE?=0x10000
     else
-      LSCRIPT_IN?=hal/$(TARGET).ld
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET).ld)
     endif
     # Board wiring, defaulted for KIT_PSE84_AI.
     PSOC_E8_UART_SCB?=2
@@ -830,7 +830,7 @@ ifeq ($(ARCH),ARM)
     ARCH_FLASH_OFFSET=0x00000000
     WOLFBOOT_ORIGIN=0x00000000
     ifneq ($(TZEN),1)
-      LSCRIPT_IN?=hal/$(TARGET)-ns.ld
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-ns.ld)
     endif
   endif
 
@@ -842,7 +842,7 @@ ifeq ($(ARCH),ARM)
       WOLFBOOT_ORIGIN=0x0C000000
     else
       WOLFBOOT_ORIGIN=0x08000000
-      LSCRIPT_IN?=hal/$(TARGET)-ns.ld
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-ns.ld)
     endif
     SPI_TARGET=stm32
     ifneq ($(DEBUG),0)
@@ -869,9 +869,9 @@ ifeq ($(ARCH),ARM)
     ARCH_FLASH_OFFSET=0x10000000
     WOLFBOOT_ORIGIN=0x10000000
     ifeq ($(TZEN),1)
-      LSCRIPT_IN?=hal/$(TARGET).ld
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET).ld)
     else
-      LSCRIPT_IN?=hal/$(TARGET)-ns.ld
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-ns.ld)
     endif
     SPI_TARGET=raspberrypi_pico
     CFLAGS+=-DPICO_SDK_PATH=$(PICO_SDK_PATH)
@@ -1420,7 +1420,7 @@ ifeq ($(ARCH),RISCV64)
       OBJS+=src/riscv_sbi.o
     endif
     # Use M-mode specific linker script
-    LSCRIPT_IN?=hal/$(TARGET)-m.ld
+    $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-m.ld)
     # Boot mode 2: reserve the last eNVM page for the signed manifest the UBL
     # stub verifies (hal/mpfs250-m.ld); `make wolfboot_envm_signed.bin` fills it.
     ifeq ($(MPFS_ENVM_MANIFEST),1)
@@ -1458,7 +1458,7 @@ ifeq ($(ARCH),RISCV64)
     CFLAGS+=-DWOLFBOOT_DUALBOOT
     ifeq ($(MPFS_L2LIM),1)
       # L2-LIM mode: wolfBoot in on-chip SRAM, loaded by HSS (no DDR)
-      LSCRIPT_IN?=hal/$(TARGET)-hss.ld
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-hss.ld)
     else
       # DDR mode (default): full MMU and FDT support
       CFLAGS+=-DMMU
@@ -1713,7 +1713,7 @@ endif
 ifeq ($(TARGET),mcxw)
   CORTEX_M33=1
   ifneq ($(TZEN),1)
-    LSCRIPT_IN?=hal/$(TARGET)-ns.ld
+    $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-ns.ld)
   endif
   CFLAGS+=\
       -I$(MCUXPRESSO_DRIVERS) \
@@ -1766,7 +1766,7 @@ endif
 ifeq ($(TARGET),mcxn)
   CORTEX_M33=1
   ifneq ($(TZEN),1)
-    LSCRIPT_IN?=hal/$(TARGET)-ns.ld
+    $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-ns.ld)
   endif
   CFLAGS+=\
       -I$(MCUXPRESSO_DRIVERS) \
@@ -1821,7 +1821,7 @@ ifeq ($(TARGET),rw612)
   CORTEX_M33=1
   ARCH_FLASH_OFFSET=0x08000000
   ifneq ($(TZEN),1)
-    LSCRIPT_IN?=hal/$(TARGET)-ns.ld
+    $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-ns.ld)
   endif
   MCUXPRESSO_FLASH_CONFIG?=$(MCUXPRESSO_PROJECT_TEMPLATE)/../flash_config
   CFLAGS+=\
@@ -1862,13 +1862,13 @@ endif
 
 ifeq ($(TARGET),nrf5340)
   ifneq ($(TZEN), 1)
-    LSCRIPT_IN?=hal/$(TARGET)-ns.ld
+    $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-ns.ld)
   endif
 endif
 
 ifeq ($(TARGET),nrf54l)
   ifneq ($(TZEN), 1)
-    LSCRIPT_IN?=hal/$(TARGET)-ns.ld
+    $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-ns.ld)
   endif
 endif
 
@@ -1930,9 +1930,9 @@ ifeq ($(TARGET),imx_rt)
   endif
 
   ifeq ($(TARGET_IMX_HAB),1)
-      LSCRIPT_IN?=hal/$(TARGET)_hab.ld
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)_hab.ld)
   else
-      LSCRIPT_IN?=hal/$(TARGET).ld
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET).ld)
   endif
 
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1064DVL6A)
@@ -2255,7 +2255,7 @@ endif
 
 ifeq ($(TARGET),lpc55s69)
   ifneq ($(TZEN),1)
-    LSCRIPT_IN?=hal/$(TARGET)-ns.ld
+    $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET)-ns.ld)
   endif
   CFLAGS+=\
       -I$(MCUXPRESSO_PROJECT_TEMPLATE) \
@@ -2463,9 +2463,9 @@ ifeq ("${FSP}", "1")
   ifeq ($(filter-out $(STAGE1),1),)
     # building stage1
     ifeq ($(FSP_TGL), 1)
-      LSCRIPT_IN ?= ../hal/x86_fsp_tgl_stage1.ld
+      $(call LSCRIPT_IN_DEFAULT,../hal/x86_fsp_tgl_stage1.ld)
     else
-      LSCRIPT_IN ?= ../hal/$(TARGET)_stage1.ld
+      $(call LSCRIPT_IN_DEFAULT,../hal/$(TARGET)_stage1.ld)
     endif
     # using ../wolfboot.map as stage1 is built from stage1 sub-directory
     LDFLAGS = --defsym main=0x`nm ../wolfboot.elf | grep -w main | awk '{print $$1}'` \
@@ -2508,9 +2508,9 @@ ifeq ("${FSP}", "1")
   else
     # building wolfBoot
     ifeq ($(FSP_TGL), 1)
-      LSCRIPT_IN ?= hal/x86_fsp_tgl.ld.in
+      $(call LSCRIPT_IN_DEFAULT,hal/x86_fsp_tgl.ld.in)
     else
-      LSCRIPT_IN ?= hal/$(TARGET).ld.in
+      $(call LSCRIPT_IN_DEFAULT,hal/$(TARGET).ld.in)
     endif
     LDFLAGS = --gc-sections --entry=main  -T $(LSCRIPT) -Map=wolfboot.map
     CFLAGS += -fno-stack-protector -fno-PIC -fno-pie -mno-mmx -mno-sse -Os -DDEBUG_UART
@@ -3092,9 +3092,9 @@ ifeq ($(ARCH), AURIX)
 
     # Linker scripts ship with the port, not in hal/.
     ifeq ($(TARGET), aurix_tc4xx_csrm)
-      LSCRIPT_IN?=$(TC4_WB_DIR)/csrm/aurix_tc4xx_csrm.ld
+      $(call LSCRIPT_IN_DEFAULT,$(TC4_WB_DIR)/csrm/aurix_tc4xx_csrm.ld)
     else
-      LSCRIPT_IN?=$(TC4_WB_DIR)/aurix_tc4xx.ld
+      $(call LSCRIPT_IN_DEFAULT,$(TC4_WB_DIR)/aurix_tc4xx.ld)
     endif
     CFLAGS += \
       -I$(TC4_LLD_DIR) \

hal/boards/stm32wb_nucleo/board.mk

@@ -1,5 +1,5 @@
 ARCH_FLASH_OFFSET=0x08000000
-LSCRIPT_IN?=hal/stm32wb.ld
+$(call LSCRIPT_IN_DEFAULT,hal/stm32wb.ld)
 
 CFLAGS+=-DWHAL_CFG_NO_TIMEOUT
 

hal/boards/stm32wba55cg_nucleo/board.mk

@@ -1,5 +1,5 @@
 ARCH_FLASH_OFFSET=0x08000000
-LSCRIPT_IN?=hal/stm32wba.ld
+$(call LSCRIPT_IN_DEFAULT,hal/stm32wba.ld)
 
 CFLAGS+=-DWHAL_CFG_NO_TIMEOUT
 

stage1/Makefile

@@ -25,7 +25,7 @@ LSCRIPT_IN_USER:=$(LSCRIPT_IN)
 # boards use hal/x86_fsp_tgl_stage1.ld) set LSCRIPT_IN in arch.mk, so
 # only default when the per-target file (or its .ld.in template) exists.
 ifneq ($(wildcard ../hal/$(TARGET)_stage1.ld ../hal/$(TARGET)_stage1.ld.in),)
-LSCRIPT_IN?=../hal/$(TARGET)_stage1.ld
+$(call LSCRIPT_IN_DEFAULT,../hal/$(TARGET)_stage1.ld)
 endif
 LSCRIPT_FLAGS:=
 LD_START_GROUP:=-Wl,--start-group

tools/config.mk

@@ -171,3 +171,9 @@ CONFIG_VARS:= ARCH TARGET SIGN HASH MCUXSDK MCUXPRESSO MCUXPRESSO_CPU MCUXPRESSO
 	CERT_CHAIN_GEN_CA_HASH \
 	CERT_CHAIN_NAME_CONSTRAINTS \
 	ENCRYPT_CACHE
+
+# ?= treats a defined-but-empty value as already set, so a stale
+# LSCRIPT_IN?= line in .config (or an exported empty env var) would skip
+# every target default. Assign $1 to LSCRIPT_IN only when it is undefined
+# or empty.
+LSCRIPT_IN_DEFAULT=$(if $(strip $(LSCRIPT_IN)),,$(eval LSCRIPT_IN:=$1))