examples/firmware_swapping: add second fw slot

Author: kYc0o

examples/firmware_swapping/Makefile

@@ -7,44 +7,57 @@ RIOTBASE ?= $(CURDIR)/../..
 # Activate FW slots
 FW_SLOTS = 1
 
-# Select slot 1
-FW_SLOT = 1
+# Define the parameters for the FW slot 1
+FW_IMAGE1_OFFSET = 0x08004000   # Start at page 8
+FW_IMAGE1_LENGTH = 0x3C000  # Reserve 120 pages
+FW_METADATA_SPACE = 0x100  # 76 bytes meta-data, 256 byte aligned
+FW_IMAGE1_END = 0x08040000 # FW_IMAGE_OFFSET + FW_IMAGE_LENGTH
+VERSION_IMG1 = 0x0
+UUID_IMG1 = 0xabcd1234
+
+# Define the parameters for the FW slot 1
+FW_IMAGE2_OFFSET = 0x08040000   # Start at page 128
+FW_IMAGE2_LENGTH = 0x3C000  # Reserve 120 pages
+FW_METADATA_SPACE = 0x100  # 76 bytes meta-data, 256 byte aligned
+FW_IMAGE1_END = 0x0807C000 # FW_IMAGE_OFFSET + FW_IMAGE_LENGTH
+VERSION_IMG2 = 0x0
+UUID_IMG2 = 0xefab5678
 
-# Give a version to this build
-VERSION = 0x0
-
-# Give an UUID
-UUID = 0xabcd1234
-
-# Define the parameters for the FW Update
-FW_IMAGE_OFFSET = 0x08004000   # Start at page 8
-FW_IMAGE_LENGTH = 0x3C000  # Reserve 120 pages
-FW_METADATA_SPACE = 0x100  # 108 bytes meta-data, 256 byte aligned
-FW_IMAGE_END = 0x08040000 # FW_IMAGE_OFFSET + FW_IMAGE_LENGTH
-	
 bootloader:
 	@cd ../bootloader; \
 	CFLAGS+=-DFW_METADATA_SPACE=$(FW_METADATA_SPACE) make clean all; \
 	cp bin/$(BOARD)/bootloader.hex ../firmware_swapping
 
 gcoap-slot1:
 	@cd ../gcoap; \
-	CFLAGS="-DFW_SLOT=$(FW_SLOT) -DVERSION=$(VERSION) -DUUID=$(UUID) \
+	CFLAGS="-DFW_SLOT=1 -DVERSION=$(VERSION_IMG1) -DUUID=$(UUID_IMG1) \
 	-DFW_SLOTS=$(FW_SLOTS)" FW_SLOTS=$(FW_SLOTS) \
-	FW_METADATA_SPACE=$(FW_METADATA_SPACE) FW_SLOT=$(FW_SLOT) \
-	FW_IMAGE_OFFSET=$(FW_IMAGE_OFFSET) FW_IMAGE_LENGTH=$(FW_IMAGE_LENGTH) \
-	FW_IMAGE_END=$(FW_IMAGE_END) VERSION=$(VERSION) UUID=$(UUID) \
+	FW_METADATA_SPACE=$(FW_METADATA_SPACE) FW_SLOT=1 \
+	FW_IMAGE_OFFSET=$(FW_IMAGE1_OFFSET) FW_IMAGE_LENGTH=$(FW_IMAGE1_LENGTH) \
+	FW_IMAGE_END=$(FW_IMAGE1_END) VERSION=$(VERSION_IMG1) UUID=$(UUID_IMG1) \
 	make clean all; \
-	cp bin/$(BOARD)/slot-image-$(UUID)-$(VERSION).bin ../firmware_swapping
+	cp bin/$(BOARD)/slot-image-$(UUID_IMG1)-$(VERSION_IMG1).bin ../firmware_swapping
+	
+default-slot2:
+	@cd ../default; \
+	CFLAGS="-DFW_SLOT=2 -DVERSION=$(VERSION_IMG2) -DUUID=$(UUID_IMG2) \
+	-DFW_SLOTS=$(FW_SLOTS)" FW_SLOTS=$(FW_SLOTS) \
+	FW_METADATA_SPACE=$(FW_METADATA_SPACE) FW_SLOT=2 \
+	FW_IMAGE_OFFSET=$(FW_IMAGE2_OFFSET) FW_IMAGE_LENGTH=$(FW_IMAGE2_LENGTH) \
+	FW_IMAGE_END=$(FW_IMAGE2_END) VERSION=$(VERSION_IMG2) UUID=$(UUID_IMG2) \
+	make clean all; \
+	cp bin/$(BOARD)/slot-image-$(UUID_IMG2)-$(VERSION_IMG2).bin ../firmware_swapping
 
 merge-binary:
-	srec_cat bootloader.hex -intel -crop 0x08000000 $(FW_IMAGE_OFFSET) \
-	slot-image-$(UUID)-$(VERSION).bin -binary -offset $(FW_IMAGE_OFFSET) \
-	-crop $(FW_IMAGE_OFFSET) $(FW_IMAGE_END) \
-	-o firmware-slot-$(FW_SLOT).hex -intel
-
-master-hex: bootloader gcoap-slot1 merge-binary
+	srec_cat bootloader.hex -intel -crop 0x08000000 $(FW_IMAGE1_OFFSET) \
+	slot-image-$(UUID_IMG1)-$(VERSION_IMG1).bin -binary -offset $(FW_IMAGE1_OFFSET) \
+	-crop $(FW_IMAGE1_OFFSET) $(FW_IMAGE1_END) \
+	slot-image-$(UUID_IMG2)-$(VERSION_IMG2).bin -binary -offset $(FW_IMAGE2_OFFSET) \
+	-crop $(FW_IMAGE2_OFFSET) $(FW_IMAGE2_END) \
+	-o firmware-slots.hex -intel
+
+master-hex: bootloader gcoap-slot1 default-slot2 merge-binary
 	@true
 
 clean:
-	@rm *.hex firmware* *.bin
+	@rm *.hex *.bin