Added upper limit for NO_PARTITIONS builds

Author: danielinux

Makefile

@@ -604,6 +604,7 @@ include/target.h: $(TARGET_H_TEMPLATE) FORCE
 	sed -e "s/@WOLFBOOT_DTS_UPDATE_ADDRESS@/$(WOLFBOOT_DTS_UPDATE_ADDRESS)/g" | \
 	sed -e "s/@WOLFBOOT_LOAD_ADDRESS@/$(WOLFBOOT_LOAD_ADDRESS)/g" | \
 	sed -e "s/@WOLFBOOT_LOAD_DTS_ADDRESS@/$(WOLFBOOT_LOAD_DTS_ADDRESS)/g" | \
+	sed -e "s/@WOLFBOOT_RAMBOOT_MAX_SIZE@/$(WOLFBOOT_RAMBOOT_MAX_SIZE)/g" | \
 	sed -e "s/@WOLFBOOT_PARTITION_SELF_HEADER_ADDRESS@/$(WOLFBOOT_PARTITION_SELF_HEADER_ADDRESS)/g" \
 		> $@
 

config/examples/polarfire_mpfs250.config

@@ -62,6 +62,7 @@ WOLFBOOT_LOAD_ADDRESS?=0x8E000000
 # Partition layout for PolarFire SoC MPFS250T
 # Using update_disk loader we just need to specify the partition number or A/B
 WOLFBOOT_NO_PARTITIONS=1
+WOLFBOOT_RAMBOOT_MAX_SIZE=0x80000000
 CFLAGS_EXTRA+=-DBOOT_PART_A=1
 CFLAGS_EXTRA+=-DBOOT_PART_B=2
 # Speed up disk partition read (512KB chunks - max DMA size)

config/examples/raspi3-encrypted.config

@@ -10,6 +10,7 @@ PKA?=0
 WOLFTPM?=0
 
 WOLFBOOT_NO_PARTITIONS=1
+WOLFBOOT_RAMBOOT_MAX_SIZE=0x20000000
 WOLFBOOT_PARTITION_BOOT_ADDRESS=0x140000
 WOLFBOOT_PARTITION_UPDATE_ADDRESS=0x1140000
 WOLFBOOT_PARTITION_SWAP_ADDRESS=0xFFFFFFFF

config/examples/raspi3.config

@@ -13,5 +13,6 @@ NO_XIP?=1
 NO_QNX?=1
 WOLFBOOT_SECTOR_SIZE=0x400
 WOLFBOOT_NO_PARTITIONS=1
+WOLFBOOT_RAMBOOT_MAX_SIZE=0x20000000
 WOLFBOOT_LOAD_ADDRESS?=0x3080000
 WOLFBOOT_LOAD_DTS_ADDRESS?=0x400000

config/examples/versal_vmk180_sdcard.config

@@ -66,6 +66,7 @@ CROSS_COMPILE=aarch64-none-elf-
 # These are 0-based indices into the parsed partition array:
 #   part[0]=boot, part[1]=OFP_A, part[2]=OFP_B, part[3]=rootfs
 WOLFBOOT_NO_PARTITIONS=1
+WOLFBOOT_RAMBOOT_MAX_SIZE=0x80000000
 CFLAGS_EXTRA+=-DBOOT_PART_A=1
 CFLAGS_EXTRA+=-DBOOT_PART_B=2
 

include/target.h.in

@@ -116,6 +116,9 @@
 /* Load address in RAM for staged OS (update_ram only) */
 #define WOLFBOOT_LOAD_ADDRESS                 @WOLFBOOT_LOAD_ADDRESS@
 #endif
+
+/* Optional RAM-boot image size cap for targets without partitions */
+#define WOLFBOOT_RAMBOOT_MAX_SIZE             @WOLFBOOT_RAMBOOT_MAX_SIZE@
 #define WOLFBOOT_LOAD_DTS_ADDRESS             @WOLFBOOT_LOAD_DTS_ADDRESS@
 
 

src/update_ram.c

@@ -82,10 +82,20 @@ int wolfBoot_ramboot(struct wolfBoot_image *img, uint8_t *src, uint8_t *dst)
 
     /* determine size of partition */
     img_size = wolfBoot_image_size((uint8_t*)dst);
+#if defined(WOLFBOOT_NO_PARTITIONS)
+#  ifndef WOLFBOOT_RAMBOOT_MAX_SIZE
+#    error "WOLFBOOT_RAMBOOT_MAX_SIZE required when WOLFBOOT_NO_PARTITIONS=1"
+#  endif
+    if (img_size > WOLFBOOT_RAMBOOT_MAX_SIZE) {
+        wolfBoot_printf("Invalid image size %u at %p\n", img_size, src);
+        return -1;
+    }
+#elif defined(WOLFBOOT_PARTITION_SIZE)
     if (img_size > (WOLFBOOT_PARTITION_SIZE - IMAGE_HEADER_SIZE)) {
         wolfBoot_printf("Invalid image size %u at %p\n", img_size, src);
         return -1;
     }
+#endif
 
     /* Read the entire image into RAM */
     wolfBoot_printf("Loading image %d bytes from %p to %p...",