Using 0x20000 as start of primary partition in the example

Author: danielinux

Makefile

@@ -6,7 +6,7 @@ LD:=$(CROSS_COMPILE)gcc
 OBJCOPY:=$(CROSS_COMPILE)objcopy
 SIZE:=$(CROSS_COMPILE)size
 BOOT_IMG?=test-app/image.bin
-BOOTLOADER_SIZE?=0x10000
+BOOT0_OFFSET?=0x20000
 SIGN?=ED25519
 TARGET?=stm32f4
 DEBUG?=0
@@ -71,7 +71,7 @@ wolfboot.bin: wolfboot.elf
 align: wolfboot-align.bin
 
 wolfboot-align.bin: wolfboot.elf
-	$(OBJCOPY) -O binary $^ $@ --pad-to=$(BOOTLOADER_SIZE) --gap-fill=255
+	$(OBJCOPY) -O binary $^ $@ --pad-to=$(BOOT0_OFFSET) --gap-fill=255
 	$(SIZE) wolfboot.elf
 
 test-app/image.bin:

include/target.h

@@ -4,21 +4,12 @@
 #define FLASH_DEV_NAME			"flash"
 #define FLASH_ALIGN			4
 
-#ifdef PLATFORM_nrf52sd
-#   define FLASH_AREA_IMAGE_0_OFFSET	0x002F000
-#   define FLASH_AREA_IMAGE_0_SIZE		0x0020000
-#   define FLASH_AREA_IMAGE_1_OFFSET	0x004f000
-#   define FLASH_AREA_IMAGE_1_SIZE		0x0020000
-#   define FLASH_AREA_IMAGE_SCRATCH_OFFSET	0x6f000
-#   define FLASH_AREA_IMAGE_SCRATCH_SIZE	0x11000
-#else 
-#   define FLASH_AREA_IMAGE_0_OFFSET	0x0010000
-#   define FLASH_AREA_IMAGE_0_SIZE		0x0010000
-#   define FLASH_AREA_IMAGE_1_OFFSET	0x0020000
-#   define FLASH_AREA_IMAGE_1_SIZE		0x0010000
-#   define FLASH_AREA_IMAGE_SCRATCH_OFFSET	0x0040000
-#   define FLASH_AREA_IMAGE_SCRATCH_SIZE	0x20000
-#endif
+#define FLASH_AREA_IMAGE_0_OFFSET	0x20000
+#define FLASH_AREA_IMAGE_0_SIZE		0x20000
+#define FLASH_AREA_IMAGE_1_OFFSET	0x40000
+#define FLASH_AREA_IMAGE_1_SIZE		0x20000
+#define FLASH_AREA_IMAGE_SCRATCH_OFFSET	0x60000
+#define FLASH_AREA_IMAGE_SCRATCH_SIZE	0x20000
 
 /*
  * Sanity check the target support.

test-app/app.ld

@@ -1,6 +1,6 @@
 MEMORY
 {
-    FLASH (rx) : ORIGIN = 0x00010100, LENGTH = 0x000FF00
+    FLASH (rx) : ORIGIN = 0x00020100, LENGTH = 0x001FF00
     RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00010000
 }
 

tools/ed25519/Makefile

@@ -1,9 +1,8 @@
 # Settings
 #
-BOOTUTIL_ROOT?=../../lib/bootutil
-
-
-CFLAGS:=-lwolfssl -DHAVE_ED25519 -DHAVE_ASN -DWOLFCRYPT_ONLY -DTFM_TIMING_RESISTANT -DNO_RSA -DECC_TIMING_RESISTANT -DWOLFSSL_DER_TO_PEM -I$(BOOTUTIL_ROOT)/include
+WOLFBOOT_ROOT=../../
+BOOTUTIL_ROOT=$(WOLFBOOT_ROOT)/lib/bootutil
+CFLAGS:=-lwolfssl -DHAVE_ED25519 -DHAVE_ASN -DWOLFCRYPT_ONLY -DTFM_TIMING_RESISTANT -DNO_RSA -DECC_TIMING_RESISTANT -DWOLFSSL_DER_TO_PEM -I$(BOOTUTIL_ROOT)/include -I$(WOLFBOOT_ROOT)/include
 
 all: ed25519_keygen ed25519_sign
 

tools/ed25519/ed25519_sign.c

@@ -27,6 +27,7 @@
 #include <wolfssl/wolfcrypt/asn_public.h>
 #include <bootutil/image.h>
 #include <sys/stat.h>    
+#include "target.h"
 
 #define IMAGE_FIRMWARE_OFFSET 256
 
@@ -140,7 +141,7 @@ int main(int argc, char *argv[])
     }
     memset(hdr, 0x00, IMAGE_FIRMWARE_OFFSET);
     hdr->ih_magic = IMAGE_MAGIC; 
-    hdr->ih_load_addr = 0x10100;
+    hdr->ih_load_addr = FLASH_AREA_IMAGE_0_OFFSET + IMAGE_FIRMWARE_OFFSET;
     hdr->ih_hdr_size = IMAGE_FIRMWARE_OFFSET;
     hdr->ih_img_size = st.st_size;
     hdr->ih_ver.iv_major = version;