Removed dependency on bootutil. Starting from a new clean-room update design

Author: danielinux

Makefile

@@ -17,14 +17,11 @@ LSCRIPT:=hal/$(TARGET).ld
 
 OBJS:= \
 ./hal/$(TARGET).o \
-./lib/bootutil/src/loader.o \
-./lib/bootutil/src/image_validate.o \
-./lib/bootutil/src/bootutil_misc.o \
+./src/loader.o \
 ./src/mem.o \
-./src/keys.o \
 ./src/crypto.o \
 ./src/wolfboot.o \
-./src/main.o \
+./src/image.o \
 ./lib/wolfssl/wolfcrypt/src/sha256.o \
 ./lib/wolfssl/wolfcrypt/src/hash.o \
 ./lib/wolfssl/wolfcrypt/src/wolfmath.o \
@@ -41,12 +38,12 @@ ifeq ($(SIGN),ED25519)
 	./lib/wolfssl/wolfcrypt/src/ed25519.o \
 	./lib/wolfssl/wolfcrypt/src/ge_low_mem.o \
     ./src/ed25519_pub_key.o
-  CFLAGS+=-DBOOT_SIGN_ED25519
+  CFLAGS+=-DWOLFBOOT_SIGN_ED25519
 endif
 
 ifeq ($(SIGN),EC256)
   OBJS+= ./ext/wolfssl/wolfcrypt/src/ecc.o
-  CFLAGS+=-DBOOT_SIGN_EC256
+  CFLAGS+=-DWOLFBOOT_SIGN_EC256
 endif
 
 ifeq ($(DEBUG),1)

NOTICE

@@ -2,8 +2,7 @@
 wolfSSL Secure Bootloader
 
 wolfBoot is a portable, OS-agnostic, secure bootloader solution for 32-bit microcontrollers, 
-relying on wolfCrypt for firmware authentication, and a modified version of 
-[mcuboot](https://www.mcuboot.com/)'s *bootutil* library to implement firmware upgrade mechanisms.
+relying on wolfCrypt for firmware authentication, providing firmware upgrade mechanisms.
 
 Due to the minimalist design of the bootloader and the tiny HAL API, wolfBoot is completely independent
 from any OS or bare-metal application, and can be easily ported and integrated in existing embedded software
@@ -32,8 +31,9 @@ with no dynamic memory allocation mechanism or linkage to any standard C library
 
 The core application depends on the following libraries:
    - wolfCrypt, which is used to verify the Ed25519 signature of the images
-   - A modified version of mcuboot's bootutil, to handle the firmware image slots and the upgrade state-machine
    - A minimalist Hardware Abstraction Layer, with an implementation provided for the supported target, which is in charge for IAP flash access and clock setting on the specific MCU
+   - The core bootloader
+   - A small application library to interact with the bootloader
 
 The goal of this application is to perform  image verification and/or requested firmware upgrade tasks 
 before chain-loading the actual firmware from a specific location in flash.

README.md

@@ -4,7 +4,7 @@ In order to run wolfBoot on a target microcontroller, an implementation of the H
 must be provided.
 
 The HAL only purposes are allowing write/erase operations from the bootloader
-and the application initiating the firmware upgrade through the bootutil library, and
+and the application initiating the firmware upgrade through the application library, and
 ensuring that the MCU is running at full speed during boot, to optimize the
 verification of the signatures.
 

docs/HAL.md

@@ -1,30 +1,16 @@
 #ifndef H_TARGETS_TARGET_
 #define H_TARGETS_TARGET_
 
-#define FLASH_DEV_NAME			"flash"
-#define FLASH_ALIGN			4
 
 /* Example flash partitioning.
  * Ensure that your firmware entry point is
  * at FLASH_AREA_IMAGE_0_OFFSET + 0x100
  */
-#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
+#define WOLFBOOT_SECTOR_SIZE			0x20000
+#define WOLFBOOT_PARTITION_SIZE			0x20000
 
-/*
- * Sanity check the target support.
- */
-#if !defined(FLASH_DEV_NAME) || \
-    !defined(FLASH_ALIGN) ||                  \
-    !defined(FLASH_AREA_IMAGE_0_OFFSET) || \
-    !defined(FLASH_AREA_IMAGE_0_SIZE) || \
-    !defined(FLASH_AREA_IMAGE_1_OFFSET) || \
-    !defined(FLASH_AREA_IMAGE_1_SIZE) 
-#error "Target support is incomplete; cannot build wolfboot."
-#endif
+#define WOLFBOOT_PARTITION_BOOT_ADDRESS 0x20000
+#define WOLFBOOT_PARTITION_UPDATE_ADDRESS 0x40000
+#define WOLFBOOT_PARTITION_SWAP_ADDRESS 0x60000
 
 #endif