Added developer mode to EEPROM

xtech · Dec 17, 2024 · a4d45f4 · a4d45f4
1 parent b47b147
commit a4d45f4
Show file tree

Hide file tree

Showing 9 changed files with 416 additions and 230 deletions.
diff --git a/bootloader/.idea/workspace.xml b/bootloader/.idea/workspace.xml
diff --git a/bootloader/CMakeLists.txt b/bootloader/CMakeLists.txt
@@ -68,14 +68,6 @@ target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE
         # Add user defined symbols
 )
 
-if(${BOOTLOADER_UNSAFE})
-message("Building Unsafe Bootloader")
-target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE
-        # Add user defined symbols
-        ALLOW_UNSAFE_BOOT
-)
-endif ()
-
 # Add linked libraries
 target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC
         # Add user defined libraries

diff --git a/bootloader/CMakePresets.json b/bootloader/CMakePresets.json
@@ -12,10 +12,6 @@
       "configurePreset": "Release",
       "name": "Release"
     },
-    {
-      "configurePreset": "ReleaseUnsafe",
-      "name": "ReleaseUnsafe"
-    },
     {
       "configurePreset": "MinSizeRel",
       "name": "MinSizeRel"
@@ -51,14 +47,6 @@
       "inherits": "default",
       "name": "Release"
     },
-    {
-      "cacheVariables": {
-        "BOOTLOADER_UNSAFE": true,
-        "CMAKE_BUILD_TYPE": "Release"
-      },
-      "inherits": "default",
-      "name": "ReleaseUnsafe"
-    },
     {
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "MinSizeRel"

diff --git a/bootloader/Dockerfile b/bootloader/Dockerfile
@@ -11,11 +11,8 @@ COPY . /project
 
 WORKDIR /project
 RUN mkdir -p build && cd build && cmake .. --preset=Release && cd Release && make -j$(nproc)
-RUN mkdir -p build && cd build && cmake .. --preset=ReleaseUnsafe && cd ReleaseUnsafe && make -j$(nproc)
 
 
 FROM scratch
 COPY --from=builder /project/build/Release/xcore-boot.elf /
 COPY --from=builder /project/build/Release/xcore-boot.bin /
-COPY --from=builder /project/build/ReleaseUnsafe/xcore-boot.elf /xcore-boot-unsafe.elf
-COPY --from=builder /project/build/ReleaseUnsafe/xcore-boot.bin /xcore-boot-unsafe.bin
diff --git a/bootloader/main.c b/bootloader/main.c
@@ -24,7 +24,7 @@ void link_up(struct netif *netif) {
 
 void jump_to_user_program(void) {
   RTC->BKP0R = 0xB0043D;
-#if defined(BOARD_HAS_EEPROM) && !defined(ALLOW_UNSAFE_BOOT)
+#if defined(BOARD_HAS_EEPROM)
 
   // Check, if we have a valid image
   struct bootloader_info info = {0};
@@ -34,6 +34,16 @@ void jump_to_user_program(void) {
     return;
   }
 
+  if (info.developer_mode == 1) {
+    // Developer mode, reboot into user program
+    RTC->BKP0R = 0xB0043D;
+    MODIFY_REG(SYSCFG->UR2, SYSCFG_UR2_BOOT_ADD0,
+               (BOOT_ADDRESS >> 16) << SYSCFG_UR2_BOOT_ADD0_Pos);
+    NVIC_SystemReset();
+    while (1)
+      ;
+  }
+
   if (info.image_present != 1) {
     return;
   }