Minor build fixes.

dgarske · dgarske · commit bfc8ebf00a76 · 2025-10-17T10:57:31.000-07:00
diff --git a/config/examples/library_fs.config b/config/examples/library_fs.config
@@ -12,18 +12,18 @@ SPMATHALL?=0
 NO_LOADER=1
 USE_GCC_HEADLESS=0
 
-# Required to build keytools
-WOLFBOOT_SECTOR_SIZE=0x1000
-
 # Flash Partition Filename
 WOLFBOOT_PARTITION_FILENAME=\"/dev/mtd0\"
+
 # Flash Sector Size
 WOLFBOOT_SECTOR_SIZE=0x2000
 # Application Partition Size
 WOLFBOOT_PARTITION_SIZE=0xA000
-# Location in flash for application
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x8000
 # Location in flash for wolfBoot
+WOLFBOOT_ORIGIN=0x0
+# Location in flash for boot partition
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x10000
+# Location in flash for update partition
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x8000
 # Location in flash for swap
 WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xFFE00
diff --git a/config/examples/zynqmp.config b/config/examples/zynqmp.config
@@ -63,6 +63,8 @@ WOLFBOOT_SECTOR_SIZE=0x20000
 # Application Partition Size
 WOLFBOOT_PARTITION_SIZE=0x2A00000
 # Location in Flash for wolfBoot
+WOLFBOOT_ORIGIN=0x0
+# Location in Flash for Primary Boot Partition
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x800000
 # Load Partition to RAM Address
 WOLFBOOT_LOAD_ADDRESS?=0x10000000
diff --git a/src/libwolfboot.c b/src/libwolfboot.c
@@ -1354,7 +1354,7 @@ uint16_t wolfBoot_get_image_type(uint8_t part)
 }
 #endif /* WOLFBOOT_FIXED_PARTITIONS */
 
-#if defined(WOLFBOOT_DUALBOOT)
+#if defined(WOLFBOOT_DUALBOOT) && !defined(WOLFBOOT_PARTITION_FILENAME)
 
 #if defined(WOLFBOOT_FIXED_PARTITIONS)
 /**

Original file line number	Diff line number	Diff line change
`@@ -1354,7 +1354,7 @@ uint16_t wolfBoot_get_image_type(uint8_t part)`
`1354`	`1354`	`}`
`1355`	`1355`	`#endif /* WOLFBOOT_FIXED_PARTITIONS */`
`1356`	`1356`
`1357`		`-#if defined(WOLFBOOT_DUALBOOT)`
	`1357`	`+#if defined(WOLFBOOT_DUALBOOT) && !defined(WOLFBOOT_PARTITION_FILENAME)`
`1358`	`1358`
`1359`	`1359`	`#if defined(WOLFBOOT_FIXED_PARTITIONS)`
`1360`	`1360`	`/**`