wip: made it work on SLSTK3401a

Author: basilfx

boards/slstk3401a/Makefile.include

@@ -18,5 +18,10 @@ USEMODULE += boards_common_silabs
 USEMODULE += silabs_aem
 USEMODULE += silabs_bc
 
+# configure riotboot slots
+export RIOTBOOT_SLOT0_SIZE ?= 0x4000
+export RIOTBOOT_SLOT1_SIZE ?= 0x1e000
+export RIOTBOOT_SLOT2_SIZE ?= 0x1e000
+
 # include board common
 include $(RIOTBOARD)/common/silabs/Makefile.include

boards/slstk3402a/Makefile.include

@@ -18,5 +18,10 @@ USEMODULE += boards_common_silabs
 USEMODULE += silabs_aem
 USEMODULE += silabs_bc
 
+# configure riotboot slots
+export RIOTBOOT_SLOT0_SIZE ?= 0x4000
+export RIOTBOOT_SLOT1_SIZE ?= 0x7e000
+export RIOTBOOT_SLOT2_SIZE ?= 0x7e000
+
 # include board common
 include $(RIOTBOARD)/common/silabs/Makefile.include

cpu/efm32/cpu.c

@@ -50,6 +50,8 @@
 #define EMU_EM4INIT         EMU_EM4INIT_DEFAULT
 #endif
 
+#ifndef BOOTLOADER
+
 #ifdef _SILICON_LABS_32B_SERIES_1
 /**
  * @brief   Initialize integrated DC-DC regulator
@@ -149,14 +151,20 @@ static void pm_init(void)
 #endif
 }
 
+#endif
+
 void cpu_init(void)
 {
+#ifndef BOOTLOADER
     /* apply errata that may be applicable (see em_chip.h) */
     CHIP_Init();
+#endif
 
     /* initialize the Cortex-M core */
     cortexm_init();
 
+#ifndef BOOTLOADER
+
 #ifdef _SILICON_LABS_32B_SERIES_1
     /* initialize dc-dc */
     dcdc_init();
@@ -165,9 +173,11 @@ void cpu_init(void)
     /* initialize clock sources and generic clocks */
     clk_init();
 
+
     /* initialize power management interface */
     pm_init();
 
     /* trigger static peripheral initialization */
     periph_init();
+#endif
 }

dist/riotboot/Makefile

@@ -4,7 +4,7 @@ BOARD ?= samr21-xpro
 
 USEMODULE += firmware
 
-CFLAGS += -DNDEBUG -DLOG_LEVEL=LOG_NONE
+CFLAGS += -DNDEBUG -DLOG_LEVEL=LOG_NONE -DBOOTLOADER
 DISABLE_MODULE += auto_init
 
 RIOTBASE ?= $(CURDIR)/../..

dist/riotboot/main.c

@@ -20,6 +20,8 @@
  * @}
  */
 
+#include <stdio.h>
+
 #include "firmware.h"
 #include "cpu.h"
 #include "panic.h"
@@ -29,26 +31,40 @@ void kernel_init(void)
     uint32_t version = 0;
     uint32_t slot = 0;
 
+    puts("Booting");
+
     /* skip slot 0 (which points to the bootloader) */
     for (unsigned i = 1; i < firmware_num_slots; i++) {
         firmware_metadata_t *slot_metadata = firmware_get_metadata(i);
-        if (firmware_validate_metadata_checksum(slot_metadata)) {
+
+        uint32_t start = firmware_get_image_startaddr(i);
+        printf("start is %08lx\n", start);
+
+        //if (firmware_validate_metadata_checksum(slot_metadata)) {
+        //    puts("broken");
             /* skip slot if metadata broken */
-            continue;
-        }
+            //continue;
+        //}*/
         if (slot_metadata->start_addr != firmware_get_image_startaddr(i)) {
+            puts("mism");
             continue;
         }
+
         if (!slot || slot_metadata->version > version) {
             version = slot_metadata->version;
             slot = i;
+            break;
         }
     }
 
+    printf("Booting slot %ld\n", slot);
+
     if (slot) {
         firmware_jump_to_slot(slot);
     }
 
+    puts("trouble");
+
     /* serious trouble! */
     while (1) {}
 }

dist/tools/firmware/verify.c

@@ -36,7 +36,7 @@ int verify(int argc, char *argv[])
         return 1;
     }
 
-    int res = firmware_simple_validate_signature(&metadata, pubkey) ? 1 : 0;
+    int res = firmware_simple_validate(&metadata, pubkey) ? 1 : 0;
     if (res) {
         printf("signature check failed\n");
         return -1;

examples/hello-world/Makefile

@@ -7,6 +7,12 @@ BOARD ?= native
 # This has to be the absolute path to the RIOT base directory:
 RIOTBASE ?= $(CURDIR)/../..
 
+# Signature verification needs quite a lot of stack
+CFLAGS += "-DTHREAD_STACKSIZE_MAIN=((6*THREAD_STACKSIZE_DEFAULT)+THREAD_EXTRA_STACKSIZE_PRINTF)"
+
+USEMODULE += ota_coap
+USEMODULE += firmware
+
 # Comment this out to disable code in RIOT that does safety checking
 # which is not needed in a production environment but helps in the
 # development process:

examples/hello-world/main.c

@@ -21,8 +21,19 @@
 
 #include <stdio.h>
 
+#include "firmware.h"
+#include "firmware/simple.h"
+
 int main(void)
 {
+    /* print some information about the running image */
+    unsigned current_slot = firmware_current_slot();
+    firmware_metadata_t *metadata = firmware_get_metadata(current_slot);
+
+    printf("firmware: running from slot %u\n", current_slot);
+    firmware_simple_print((firmware_simple_t*)metadata);
+
+
     puts("Hello World!");
 
     printf("You are running RIOT on a(n) %s board.\n", RIOT_BOARD);

makefiles/riotboot.mk

@@ -37,7 +37,7 @@ $(BINDIR)/$(APPLICATION)-slot2.elf: OFFSET=$(SLOT2_OFFSET)
 $(BINDIR)/$(APPLICATION)-slot2.elf: LENGTH=$(SLOT2_LENGTH)
 
 # signing targets
-$(BINDIR)/$(APPLICATION)-%.bin:
+$(BINDIR)/$(APPLICATION)-slot1.bin:
 	@echo "creating $@..."
 	$(Q) $(OBJCOPY) -Obinary $< $@.tmp
 	$(Q) $(FIRMWARE_TOOL) sign $@.tmp $(APP_VER) $(APP_ID) $(OFFSET) $(RIOTBOOT_SECKEY) - > $@

sys/firmware/firmware_simple.c

@@ -31,15 +31,18 @@
 #else
 #include <stdio.h>
 #define LOG_INFO(...) printf(__VA_ARGS__)
+#define LOG_WARNING(...) printf(__VA_ARGS__)
 #endif
 
 #include "firmware.h"
 #include "firmware/simple.h"
 
+#ifdef RIOT_VERSION
 static inline size_t min(size_t a, size_t b)
 {
     return a <= b ? a : b;
 }
+#endif
 
 void firmware_simple_print(firmware_simple_t *simple)
 {
@@ -68,6 +71,7 @@ void firmware_simple_print(firmware_simple_t *simple)
     }
 }
 
+#ifdef RIOT_VERSION
 int firmware_simple_validate_size(firmware_simple_update_t *simple)
 {
     if (simple->m.metadata.size <= firmware_flashwrite_slotsize(&simple->writer)) {
@@ -77,6 +81,7 @@ int firmware_simple_validate_size(firmware_simple_update_t *simple)
         return -1;
     }
 }
+#endif
 
 int firmware_simple_validate(firmware_simple_t *simple, const unsigned char *pk)
 {