more improvements

flashloader/README.md

@@ -15,6 +15,9 @@ interface.
 
 ## Using the Python image loader
 
+The Python image loader communicates with the Rust flashload application using a dedicated serial
+port with a baudrate of 115200.
+
 It is recommended to run the script in a dedicated virtual environment. For example, on UNIX
 systems you can use `python3 -m venv venv` and then `source venv/bin/activate` to create
 and activate a virtual environment.

flashloader/image-loader.py

@@ -23,26 +23,27 @@ from elftools.elf.elffile import ELFFile
 
 
 BAUD_RATE = 115200
+
 BOOTLOADER_START_ADDR = 0x0
 BOOTLOADER_END_ADDR = 0x4000
-BOOTLOADER_CRC_ADDR = 0x3FFC
+BOOTLOADER_CRC_ADDR = BOOTLOADER_END_ADDR - 4
 BOOTLOADER_MAX_SIZE = BOOTLOADER_END_ADDR - BOOTLOADER_START_ADDR - 4
 
 APP_A_START_ADDR = 0x4000
 APP_A_END_ADDR = 0x22000
 # The actual size of the image which is relevant for CRC calculation.
-APP_A_SIZE_ADDR = 0x21FF8
-APP_A_CRC_ADDR = 0x21FFC
+APP_A_SIZE_ADDR = APP_A_END_ADDR - 8
+APP_A_CRC_ADDR = APP_A_END_ADDR - 4
 APP_A_MAX_SIZE = APP_A_END_ADDR - APP_A_START_ADDR - 8
 
 APP_B_START_ADDR = 0x22000
 APP_B_END_ADDR = 0x40000
 # The actual size of the image which is relevant for CRC calculation.
-APP_B_SIZE_ADDR = 0x3FFF8
-APP_B_CRC_ADDR = 0x3FFFC
+APP_B_SIZE_ADDR = APP_B_END_ADDR - 8
+APP_B_CRC_ADDR = APP_B_END_ADDR - 4
 APP_B_MAX_SIZE = APP_A_END_ADDR - APP_A_START_ADDR - 8
 
-APP_IMG_SZ = 0x1E000
+APP_IMG_SZ = (APP_B_END_ADDR - APP_A_START_ADDR) // 2
 
 CHUNK_SIZE = 896
 
@@ -74,7 +75,7 @@ class LoadableSegment:
 class Target(enum.Enum):
     BOOTLOADER = 0
     APP_A = 1
-    APP_B = 1
+    APP_B = 2
 
 
 class ImageLoader:
@@ -290,7 +291,8 @@ def main() -> int:
     result = -1
     if args.ping:
         image_loader.handle_ping_cmd()
-        result = 0
+        com_if.close()
+        return 0
     if target:
         if not args.corrupt:
             if not args.path:
@@ -299,11 +301,11 @@ def main() -> int:
             if not file_path.exists():
                 _LOGGER.error("File does not exist")
     if args.corrupt:
-        if target:
-            image_loader.handle_corruption_cmd(target)
-            result = 0
-        else:
+        if not target:
             _LOGGER.error("target for corruption command required")
+            com_if.close()
+            return -1
+        image_loader.handle_corruption_cmd(target)
     else:
         assert file_path is not None
         assert target is not None

flashloader/slot-a-blinky/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2021"
 
 [dependencies]
 cortex-m-rt = "0.7"
-va416xx-hal = { path = "../../va416xx-hal", features = ["va41630"] }
 panic-rtt-target = { version = "0.1.3" }
 rtt-target = { version = "0.5" }
 cortex-m = { version = "0.7", features = ["critical-section-single-core"] }

flashloader/slot-b-blinky/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2021"
 
 [dependencies]
 cortex-m-rt = "0.7"
-va416xx-hal = { path = "../../va416xx-hal", features = ["va41630"] }
 panic-rtt-target = { version = "0.1.3" }
 rtt-target = { version = "0.5" }
 cortex-m = { version = "0.7", features = ["critical-section-single-core"] }