Merge #358

358: Add microbit_v2 layout r=jrvanwhy a=alexandruradovici The PR adds the microbit_v2 memory layout and modifies `flash.sh` to (hopefully) work with both versions of libtock. It also adds the`microbit_v2` board to the Makefile, even tough Makefile uses libtock1. Co-authored-by: Alexandru Radovici <[email protected]>
tock · Jan 18, 2022 · 4c7ecb6 · 4c7ecb6
2 parents 6f8b512 + 253e4a8
commit 4c7ecb6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -11,6 +11,7 @@ usage:
 	@echo "libtock-rs currently includes support for the following platforms:"
 	@echo " - hail"
 	@echo " - nrf52840"
+	@echo " - microbit_v2"
 	@echo " - nucleo_f429zi"
 	@echo " - nucleo_f446re"
 	@echo " - opentitan"
@@ -153,6 +154,14 @@ hail:
 flash-hail:
 	PLATFORM=hail cargo run $(release) --target=thumbv7em-none-eabi --example $(EXAMPLE) $(features)
 
+.PHONY: microbit_v2
+microbit_v2:
+	PLATFORM=microbit_v2 cargo build $(release) --target=thumbv7em-none-eabi --examples $(features)
+
+.PHONY: flash-microbit_v2
+flash-microbit_v2:
+	PLATFORM=microbit_v2 cargo run $(release) --target=thumbv7em-none-eabi --example $(EXAMPLE) $(features)
+
 .PHONY: nucleo_f429zi
 nucleo_f429zi:
 	PLATFORM=nucleo_f429zi cargo build $(release) --target=thumbv7em-none-eabi --examples $(features)

diff --git a/runtime/layouts/microbit_v2.ld b/runtime/layouts/microbit_v2.ld
@@ -0,0 +1,9 @@
+/* Layout for the micro:bit v2 board, used by the examples in this repository. */
+
+MEMORY {
+  FLASH (X) : ORIGIN = 0x00040000, LENGTH = 256K
+  RAM (W) : ORIGIN = 0x20004000, LENGTH = 112K
+}
+
+TBF_HEADER_SIZE = 0x48;
+INCLUDE libtock_layout.ld
diff --git a/tools/flash.sh b/tools/flash.sh
@@ -1,5 +1,15 @@
 #!/usr/bin/env bash
 
+TBF_HEADER=64
+KERNEL_VERSION=""
+
+if [ ! -z $LIBTOCK_PLATFORM ]; then
+    # we are using libtock2
+	PLATFORM=$LIBTOCK_PLATFORM
+	TBF_HEADER=72
+    KERNEL_VERSION="--kernel-major 2 --kernel-minor 0"
+fi
+
 set -eux
 
 artifact="$(basename $1)"
@@ -20,6 +30,11 @@ case "${PLATFORM}" in
         binary_name=cortex-m4.elf
         tockload=n
         ;;
+    "microbit_v2")
+        tockloader_flags="--bundle-apps"
+        binary_name=cortex-m4.elf
+        tockload=y
+        ;;
     "nucleo_f429zi"|"nucleo_f446re")
         tockloader_flags=""
         binary_name=cortex-m4.elf
@@ -70,7 +85,7 @@ cp "$1" "${elf_file_name}"
 
 STACK_SIZE=$(nm --print-size --size-sort --radix=d "${elf_file_name}" | grep STACK_MEMORY | cut -d " " -f 2)
 
-elf2tab -n "${artifact}" -o "${tab_file_name}" "${elf_file_name}" --stack ${STACK_SIZE} --app-heap $APP_HEAP_SIZE --kernel-heap $KERNEL_HEAP_SIZE --protected-region-size=64
+elf2tab -n "${artifact}" -o "${tab_file_name}" "${elf_file_name}" --stack ${STACK_SIZE} --app-heap $APP_HEAP_SIZE --kernel-heap $KERNEL_HEAP_SIZE --protected-region-size=$TBF_HEADER $KERNEL_VERSION
 
 if [ $tockload == "n" ]; then
 	echo "Skipping flashing for platform \"${PLATFORM}\""