fix: support DEBUG=0 build

* build lib/wolfssl/wolfcrypt/src/logging.o unconditionally,
* gate debug printing in do_tpm_selftest() appropriately,
* initialize top_address in src/boot_x86_fsp.c:start() to fix -Wmaybe-uninitialized,
* and add __attribute__((used)) to static src/x86/exceptions.c:common_exception_handler() and _timer_handler() implementations to accommodate asm-only calling;
* fix parallel make: add dependency of stage1/loader_stage1.bin on wolfboot.elf.
* add -ffreestanding -static flags to avoid gcc compiler optimize strings functions

Co-authored-by: Daniel Pouzzner <[email protected]>

Author: douzzer

Makefile

@@ -137,6 +137,7 @@ BOOTLOADER_PARTITION_SIZE?=$$(( $(WOLFBOOT_PARTITION_BOOT_ADDRESS) - $(ARCH_FLAS
 all: $(MAIN_TARGET)
 
 stage1: stage1/loader_stage1.bin
+stage1/loader_stage1.bin: wolfboot.elf
 stage1/loader_stage1.bin: FORCE
 	@echo "\t[BIN] $@"
 	$(Q)$(MAKE) -C $(dir $@) $(notdir $@)

arch.mk

@@ -671,7 +671,10 @@ endif
 ifeq ($(filter $(TARGET),x86_fsp_qemu kontron_vx3060_s2),$(TARGET))
   FSP=1
   CFLAGS+=-DWOLFBOOT_FSP=1
-  CFLAGS+=-ffunction-sections -fdata-sections
+  CFLAGS+=-ffunction-sections -fdata-sections -ffreestanding -nostdlib -static
+  # some std libc have headers that bring in extra symbols used in
+  # FORTIFY_SOURCE realated checks. Use -U_FORTIFY_SOURCE to avoid that.
+  CFLAGS+=-U_FORTIFY_SOURCE
   ifeq ($(TARGET), kontron_vx3060_s2)
     FSP_TGL=1
     CFLAGS+=-DWOLFBOOT_TGL=1
@@ -840,9 +843,7 @@ CFLAGS+=-DWOLFBOOT_ORIGIN=$(WOLFBOOT_ORIGIN)
 CFLAGS+=-DBOOTLOADER_PARTITION_SIZE=$(BOOTLOADER_PARTITION_SIZE)
 
 ## Debug
-ifeq ($(DEBUG),1)
-  WOLFCRYPT_OBJS+=./lib/wolfssl/wolfcrypt/src/logging.o
-endif
+WOLFCRYPT_OBJS+=./lib/wolfssl/wolfcrypt/src/logging.o
 
 # Debug UART
 ifeq ($(DEBUG_UART),1)

config/examples/kontron_vx3060_s2.config

@@ -3,7 +3,7 @@ TARGET=kontron_vx3060_s2
 WOLFBOOT_SMALL_STACK=0
 SIGN=ECC384
 HASH=SHA256
-DEBUG=1
+DEBUG=0
 SPMATH=1
 ENCRYPTION=0
 WOLFBOOT_NO_PARTITIONS=1
@@ -63,4 +63,5 @@ DISK_LOCK=0
 WOLFTPM=1
 WOLFBOOT_TPM_SEAL=1
 WOLFBOOT_TPM_SEAL_KEY_ID=1
-WOLFBOOT_UNIVERSAL_KEYSTORE=1
+WOLFBOOT_UNIVERSAL_KEYSTORE=1
+DEBUG_SYMBOLS=1

config/examples/x86_fsp_qemu_seal.config

@@ -3,7 +3,7 @@ TARGET=x86_fsp_qemu
 WOLFBOOT_SMALL_STACK=0
 SIGN=ECC384
 HASH=SHA256
-DEBUG=1
+DEBUG=0
 SPMATH=1
 FORCE_32BIT=1
 ENCRYPTION=0
@@ -45,4 +45,5 @@ MEASURED_PCR_A=0
 WOLFBOOT_TPM_SEAL=1
 WOLFBOOT_TPM_SEAL_KEY_ID=1
 DISK_LOCK=1
-WOLFBOOT_UNIVERSAL_KEYSTORE=1
+WOLFBOOT_UNIVERSAL_KEYSTORE=1
+DEBUG_SYMBOLS=1

include/user_settings.h

@@ -40,8 +40,12 @@
 #define SIZEOF_LONG_LONG 8
 
 #define CTYPE_USER /* don't let wolfCrypt types.h include ctype.h */
+#ifndef toupper
 extern int toupper(int c);
+#endif
+#ifndef tolower
 extern int tolower(int c);
+#endif
 #define XTOUPPER(c)     toupper((c))
 #define XTOLOWER(c)     tolower((c))
 

src/boot_x86_fsp.c

@@ -744,7 +744,7 @@ void start(uint32_t stack_base, uint32_t stack_top, uint64_t timestamp,
     uint8_t *fsp_m_base, done = 0;
     struct efi_hob *hobList, *it;
     memory_init_cb MemoryInit;
-    uint64_t top_address;
+    uint64_t top_address = MEMORY_4GB;
     uint32_t new_stack;
     uint32_t status;
     uint16_t type;
@@ -836,7 +836,7 @@ void start(uint32_t stack_base, uint32_t stack_top, uint64_t timestamp,
     hob_dump_memory_map(hobList);
 #endif /* DEBUG */
 
-    if (top_address > MEMORY_4GB) {
+    if (top_address >= MEMORY_4GB) {
         panic();
     }
 

src/x86/exceptions.c

@@ -79,7 +79,7 @@ static struct idt_descriptor idt_descriptor;
                    : ""(X));                                                   \
     }
 
-static void common_exception_handler(uint64_t vector_number)
+__attribute__((used)) static void common_exception_handler(uint64_t vector_number)
 {
     EXCEPTIONS_DEBUG_PRINTF("CPU exception: %d\r\n", (int)vector_number);
 }
@@ -133,7 +133,7 @@ int setup_interrupt_gate(int vnum, uintptr_t handler)
     ig->reserved = 0x0;
 }
 
-static void _timer_handler()
+__attribute__((used)) static void _timer_handler()
 {
     EXCEPTIONS_DEBUG_PRINTF("In the timer handler\r\n");
 }