Fixed more regressions

Author: danielinux

include/target.h.in

@@ -110,37 +110,38 @@
 #define WOLFBOOT_DTS_BOOT_ADDRESS             @WOLFBOOT_DTS_BOOT_ADDRESS@
 #define WOLFBOOT_DTS_UPDATE_ADDRESS           @WOLFBOOT_DTS_UPDATE_ADDRESS@
 
-#if !defined(WOLFBOOT_PART_USE_ARCH_OFFSET) && !defined(PULL_LINKER_DEFINES)
+#if defined(WOLFBOOT_FIXED_PARTITIONS) && \
+    !defined(WOLFBOOT_PART_USE_ARCH_OFFSET) && !defined(PULL_LINKER_DEFINES)
     /*
      * Only compare partitions that share the same internal flash address
      * space. External partitions and runtime/linker-provided addresses are
      * validated elsewhere.
      */
     #if !defined(PART_BOOT_EXT) && !defined(PART_UPDATE_EXT) && \
-        (WOLFBOOT_PARTITION_UPDATE_ADDRESS != 0) && \
-        ((WOLFBOOT_PARTITION_BOOT_ADDRESS + WOLFBOOT_PARTITION_SIZE) > \
-         WOLFBOOT_PARTITION_UPDATE_ADDRESS) && \
-        (WOLFBOOT_PARTITION_BOOT_ADDRESS < \
-         (WOLFBOOT_PARTITION_UPDATE_ADDRESS + WOLFBOOT_PARTITION_SIZE))
+        ((WOLFBOOT_PARTITION_UPDATE_ADDRESS + 0) != 0) && \
+        ((WOLFBOOT_PARTITION_BOOT_ADDRESS + 0 + WOLFBOOT_PARTITION_SIZE + 0) > \
+         (WOLFBOOT_PARTITION_UPDATE_ADDRESS + 0)) && \
+        ((WOLFBOOT_PARTITION_BOOT_ADDRESS + 0) < \
+         (WOLFBOOT_PARTITION_UPDATE_ADDRESS + 0 + WOLFBOOT_PARTITION_SIZE + 0))
         #error "Boot and update partitions overlap"
     #endif
 
     #if !defined(PART_BOOT_EXT) && !defined(PART_SWAP_EXT) && \
-        (WOLFBOOT_PARTITION_SWAP_ADDRESS != 0) && \
-        ((WOLFBOOT_PARTITION_BOOT_ADDRESS + WOLFBOOT_PARTITION_SIZE) > \
-         WOLFBOOT_PARTITION_SWAP_ADDRESS) && \
-        (WOLFBOOT_PARTITION_BOOT_ADDRESS < \
-         (WOLFBOOT_PARTITION_SWAP_ADDRESS + WOLFBOOT_SECTOR_SIZE))
+        ((WOLFBOOT_PARTITION_SWAP_ADDRESS + 0) != 0) && \
+        ((WOLFBOOT_PARTITION_BOOT_ADDRESS + 0 + WOLFBOOT_PARTITION_SIZE + 0) > \
+         (WOLFBOOT_PARTITION_SWAP_ADDRESS + 0)) && \
+        ((WOLFBOOT_PARTITION_BOOT_ADDRESS + 0) < \
+         (WOLFBOOT_PARTITION_SWAP_ADDRESS + 0 + WOLFBOOT_SECTOR_SIZE))
         #error "Boot and swap partitions overlap"
     #endif
 
     #if !defined(PART_UPDATE_EXT) && !defined(PART_SWAP_EXT) && \
-        (WOLFBOOT_PARTITION_UPDATE_ADDRESS != 0) && \
-        (WOLFBOOT_PARTITION_SWAP_ADDRESS != 0) && \
-        ((WOLFBOOT_PARTITION_UPDATE_ADDRESS + WOLFBOOT_PARTITION_SIZE) > \
-         WOLFBOOT_PARTITION_SWAP_ADDRESS) && \
-        (WOLFBOOT_PARTITION_UPDATE_ADDRESS < \
-         (WOLFBOOT_PARTITION_SWAP_ADDRESS + WOLFBOOT_SECTOR_SIZE))
+        ((WOLFBOOT_PARTITION_UPDATE_ADDRESS + 0) != 0) && \
+        ((WOLFBOOT_PARTITION_SWAP_ADDRESS + 0) != 0) && \
+        ((WOLFBOOT_PARTITION_UPDATE_ADDRESS + 0 + WOLFBOOT_PARTITION_SIZE + 0) > \
+         (WOLFBOOT_PARTITION_SWAP_ADDRESS + 0)) && \
+        ((WOLFBOOT_PARTITION_UPDATE_ADDRESS + 0) < \
+         (WOLFBOOT_PARTITION_SWAP_ADDRESS + 0 + WOLFBOOT_SECTOR_SIZE))
         #error "Update and swap partitions overlap"
     #endif
 #endif

src/update_flash.c

@@ -570,12 +570,12 @@ static int RAMFUNCTION wolfBoot_swap_and_final_erase(int resume)
 static inline uint32_t wb_im2n32(uint32_t val)
 {
 #ifdef BIG_ENDIAN_ORDER
-    return val;
-#else
     return (((val & 0x000000FFU) << 24) |
             ((val & 0x0000FF00U) << 8) |
             ((val & 0x00FF0000U) >> 8) |
             ((val & 0xFF000000U) >> 24));
+#else
+    return val;
 #endif
 }
 

tools/keytools/otp/Makefile

@@ -19,6 +19,7 @@ CFLAGS+=-I. -I../../../ -I../../../include -I$(WOLFBOOT_LIB_WOLFSSL) \
 CFLAGS+=-I./wcs
 CFLAGS+=-DFLASH_OTP_KEYSTORE -D__FLASH_OTP_PRIMER -DWOLFSSL_USER_SETTINGS -DWOLFCRYPT_SECURE_MODE
 PRI_KS_OBJS+=startup.o otp-keystore-primer.o ../../../src/keystore.o
+PRI_KS_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/memory.o
 
 ifeq ($(HASH),SHA256)
     PRI_KS_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sha256.o

tools/unit-tests/Makefile

@@ -241,6 +241,7 @@ unit-boot-x86-fsp: ../../include/target.h unit-boot-x86_fsp.c
 
 unit-loader-tpm-init: ../../include/target.h unit-loader-tpm-init.c
 	gcc -o $@ $^ $(CFLAGS) -I$(WOLFBOOT_LIB_WOLFTPM) -DWOLFBOOT_LOADER_MAIN -DWOLFBOOT_TPM \
+		-DWOLFTPM_USER_SETTINGS \
 		-DWOLFBOOT_HOOK_PANIC -DWOLFBOOT_SIGN_ECC256 \
 		-DWOLFBOOT_HASH_SHA256 -ffunction-sections -fdata-sections \
 		$(LDFLAGS) -Wl,--gc-sections