Configuration (via .config), single entry point for options

Author: danielinux

.gitignore

@@ -67,11 +67,17 @@ tools/ecc256/ecc256_keygen
 cscope.out
 tags
 
-# Generated files using target.h
+# Generated files
+.wolfboot-config
+include/target.h
 .wolfboot-arch-offset
 .wolfboot-offset
 .wolfboot-partition-size
+.bootloader-partition-size
 
 # Test tools
 tools/test-expect-version/test-expect-version
 tools/test-update-server/server
+config/*.ld
+
+

Makefile

@@ -3,34 +3,13 @@
 # Configure by passing alternate values
 # via environment variables.
 #
-# Default values:
-ARCH?=ARM
-TARGET?=stm32f4
-SIGN?=ED25519
-KINETIS?=$(HOME)/src/FRDM-K64F
-KINETIS_CPU=MK64FN1M0VLL12
-KINETIS_DRIVERS?=$(KINETIS)/devices/MK64F12
-KINETIS_CMSIS?=$(KINETIS)/CMSIS
-FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk
-DEBUG?=0
-VTOR?=1
-CORTEX_M0?=0
-NO_ASM?=0
-EXT_FLASH?=0
-SPI_FLASH?=0
-ALLOW_DOWNGRADE?=0
-NVM_FLASH_WRITEONCE?=0
-WOLFBOOT_VERSION?=0
-V?=0
-SPMATH?=1
-RAM_CODE?=0
-DUALBANK_SWAP=0
-
-
+# Configuration values: see tools/config.mk
+-include .config
+include tools/config.mk
 
 ## Initializers
 CFLAGS:=-D__WOLFBOOT  -DWOLFBOOT_VERSION=$(WOLFBOOT_VERSION)UL
-LSCRIPT:=hal/$(TARGET).ld
+LSCRIPT:=config/target.ld
 LDFLAGS:=-T $(LSCRIPT) -Wl,-gc-sections -Wl,-Map=wolfboot.map -ffreestanding -nostartfiles
 OBJS:= \
 ./hal/$(TARGET).o \
@@ -43,6 +22,7 @@ OBJS:= \
 ./lib/wolfssl/wolfcrypt/src/wolfmath.o \
 ./lib/wolfssl/wolfcrypt/src/fe_low_mem.o
 
+
 ## Architecture/CPU configuration
 include arch.mk
 
@@ -136,26 +116,23 @@ wolfboot.hex: wolfboot.elf
 	$(Q)$(OBJCOPY) -O ihex $^ $@
 
 align: wolfboot-align.bin
-
-wolfboot-align.bin: wolfboot.bin
-	@cat include/target.h | grep WOLFBOOT_PARTITION_BOOT_ADDRESS | tr -d "\n\r" | sed -e "s/.*[ ]//g" > .wolfboot-offset
-	@printf "%d" `cat .wolfboot-offset` > .wolfboot-offset
+	
+.bootloader-partition-size:
+	@printf "%d" $(WOLFBOOT_PARTITION_BOOT_ADDRESS) > .wolfboot-offset
 	@printf "%d" $(ARCH_FLASH_OFFSET) > .wolfboot-arch-offset
-	@expr `cat .wolfboot-offset` - `cat .wolfboot-arch-offset` > .wolfboot-partition-size
-	@dd if=/dev/zero bs=`cat .wolfboot-partition-size` count=1 2>/dev/null | tr "\000" "\377" > $(@)
-	@#rm -f .wolfboot-partition-size .wolfboot-offset .wolfboot-arch-offset
-	@dd if=$^ of=$(@) conv=notrunc 2>/dev/null
+	@expr `cat .wolfboot-offset` - `cat .wolfboot-arch-offset` > .bootloader-partition-size
+	@rm -f .wolfboot-offset .wolfboot-arch-offset
+
+wolfboot-align.bin: .bootloader-partition-size wolfboot.bin
+	@dd if=/dev/zero bs=`cat .bootloader-partition-size` count=1 2>/dev/null | tr "\000" "\377" > $(@)
+	@dd if=wolfboot.bin of=$(@) conv=notrunc 2>/dev/null
 	@echo
 	@echo "\t[SIZE]"
 	@$(SIZE) wolfboot.elf
 	@echo
 
-test-app/image.bin:
-	@make -C test-app TARGET=$(TARGET) EXT_FLASH=$(EXT_FLASH) SPI_FLASH=$(SPI_FLASH) ARCH=$(ARCH) \
-    V=$(V) RAM_CODE=$(RAM_CODE) WOLFBOOT_VERSION=$(WOLFBOOT_VERSION)\
-	KINETIS=$(KINETIS) KINETIS_CPU=$(KINETIS_CPU) KINETIS_DRIVERS=$(KINETIS_DRIVERS) \
-	KINETIS_CMSIS=$(KINETIS_CMSIS) NVM_FLASH_WRITEONCE=$(NVM_FLASH_WRITEONCE) \
-	FREEDOM_E_SDK=$(FREEDOM_E_SDK)
+test-app/image.bin: wolfboot-align.bin
+	@make -C test-app
 	@rm -f src/*.o hal/*.o
 	@$(SIZE) test-app/image.elf
 
@@ -173,10 +150,15 @@ factory.bin: $(BOOT_IMG) wolfboot-align.bin $(PRIVATE_KEY)
 	@echo "\t[MERGE] $@"
 	@cat wolfboot-align.bin test-app/image_v1_signed.bin > $@
 
-wolfboot.elf: $(OBJS) $(LSCRIPT)
+wolfboot.elf: include/target.h $(OBJS) $(LSCRIPT)
 	@echo "\t[LD] $@"
 	$(Q)$(LD) $(LDFLAGS) -Wl,--start-group $(OBJS) -Wl,--end-group -o $@
 
+$(LSCRIPT): hal/$(TARGET).ld .bootloader-partition-size FORCE
+	@cat hal/$(TARGET).ld | \
+		sed -e "s/##WOLFBOOT_PARTITION_BOOT_ADDRESS##/`cat .bootloader-partition-size`/g" \
+		> $@
+
 src/ed25519_pub_key.c: ed25519.der
 
 src/ecc256_pub_key.c: ecc256.der
@@ -185,12 +167,23 @@ keys: $(PRIVATE_KEY)
 
 clean:
 	@find . -type f -name "*.o" | xargs rm -f
-	@rm -f *.bin *.elf wolfboot.map *.bin  *.hex
+	@rm -f *.bin *.elf wolfboot.map *.bin  *.hex config/target.ld
 	@make -C test-app clean
 
 distclean: clean
-	@rm -f *.pem *.der tags ./src/ed25519_pub_key.c ./src/ecc256_pub_key.c
+	@rm -f *.pem *.der tags ./src/ed25519_pub_key.c ./src/ecc256_pub_key.c include/target.h
+
+include/target.h: include/target.h.in FORCE
+	@cat include/target.h.in | \
+	sed -e "s/##WOLFBOOT_PARTITION_SIZE##/$(WOLFBOOT_PARTITION_SIZE)/g" | \
+	sed -e "s/##WOLFBOOT_SECTOR_SIZE##/$(WOLFBOOT_SECTOR_SIZE)/g" | \
+	sed -e "s/##WOLFBOOT_PARTITION_BOOT_ADDRESS##/$(WOLFBOOT_PARTITION_BOOT_ADDRESS)/g" | \
+	sed -e "s/##WOLFBOOT_PARTITION_UPDATE_ADDRESS##/$(WOLFBOOT_PARTITION_UPDATE_ADDRESS)/g" | \
+	sed -e "s/##WOLFBOOT_PARTITION_SWAP_ADDRESS##/$(WOLFBOOT_PARTITION_SWAP_ADDRESS)/g" \
+		> $@
 
+config: FORCE
+	make -C config
 
 %.o:%.c
 	@echo "\t[CC-$(ARCH)] $@"
@@ -202,3 +195,4 @@ distclean: clean
 
 FORCE: 
 
+.PHONY: FORCE clean

config/Makefile

@@ -0,0 +1,8 @@
+-include ../.config
+include ../tools/config.mk
+config:
+	rm -f ../config/target.ld
+	rm -f ../.config
+	rm -f ../include/target.h
+	@$(foreach q, $(CONFIG_VARS), a=$($q); echo -n $q \? [$$a] :; a=$($q); read SH_$q; test -z $$SH_$q && SH_$q=$$a; echo "$q?=$$SH_$q" >> ../.config;)
+

config/examples/hifive1.config

@@ -0,0 +1,21 @@
+ARCH?=RISCV
+TARGET?=hifive1
+SIGN?=ECC256
+FREEDOM_E_SDK?=~/src/freedom-e-sdk
+DEBUG?=0
+VTOR?=1
+CORTEX_M0?=0
+NO_ASM?=1
+ALLOW_DOWNGRADE?=0
+NVM_FLASH_WRITEONCE?=0
+WOLFBOOT_VERSION?=1
+V?=0
+SPMATH?=1
+RAM_CODE?=1
+DUALBANK_SWAP?=0
+IMAGE_HEADER_SIZE?=256
+WOLFBOOT_PARTITION_SIZE?=0x80000
+WOLFBOOT_SECTOR_SIZE?=0x1000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20020000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x20060000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x200A0000

config/examples/stm32f7-dualbank.config

@@ -0,0 +1,22 @@
+ARCH?=ARM
+TARGET?=stm32f7
+SIGN?=ECC256
+DEBUG?=0
+VTOR?=1
+CORTEX_M0?=0
+NO_ASM?=0
+EXT_FLASH?=0
+SPI_FLASH?=0
+ALLOW_DOWNGRADE?=0
+NVM_FLASH_WRITEONCE?=0
+WOLFBOOT_VERSION?=1
+V?=0
+SPMATH?=1
+RAM_CODE?=1
+DUALBANK_SWAP?=1
+IMAGE_HEADER_SIZE?=256
+WOLFBOOT_PARTITION_SIZE?=0x80000
+WOLFBOOT_SECTOR_SIZE?=0x20000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x8020000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x8120000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x0

config/examples/stm32wb-small.config

@@ -0,0 +1,4 @@
+TARGET=stm32wb
+SIGN=ECC256
+WOLFBOOT_PARTITION_BOOT_ADDRESS=0xA000
+WOLFBOOT_PARTITION_SIZE=0x4000

hal/cc26x2.ld

@@ -1,6 +1,6 @@
 MEMORY
 {
-    FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x0010000
+    FLASH (rx) : ORIGIN = 0x00000000, LENGTH = ##WOLFBOOT_PARTITION_BOOT_ADDRESS##
     RAM (rwx) :  ORIGIN = 0x20002800, LENGTH = 0xD800
 }
 

hal/hifive1.ld

@@ -4,7 +4,7 @@ ENTRY( _reset )
 
 MEMORY
 {
-  FLASH(rxai!w) : ORIGIN = 0x20010000, LENGTH = 64K
+  FLASH(rxai!w) : ORIGIN = 0x20010000, LENGTH = ##WOLFBOOT_PARTITION_BOOT_ADDRESS##
   RAM(wxa!ri) : ORIGIN = 0x80000000, LENGTH = 16K
 }
 

hal/kinetis.ld

@@ -1,6 +1,6 @@
 MEMORY
 {
-    FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x000A000
+    FLASH (rx) : ORIGIN = 0x00000000, LENGTH = ##WOLFBOOT_PARTITION_BOOT_ADDRESS##
     RAM (rwx)  : ORIGIN = 0x1FFF0000, LENGTH = 64K
 }
 

hal/nrf52.ld

@@ -1,6 +1,6 @@
 MEMORY
 {
-    FLASH (rx) : ORIGIN = 0x0001f000, LENGTH = 0x0010000
+    FLASH (rx) : ORIGIN = 0x0001f000, LENGTH = ##WOLFBOOT_PARTITION_BOOT_ADDRESS##
     RAM (rwx) :  ORIGIN = 0x20002800, LENGTH = 0xD800
 }