Add OfwFix Value to config

Author: SciLor

sd-bootloader-ng/bootmanager/config.c

@@ -7,6 +7,7 @@ sGeneralSettings Config_generalSettings = {
   false,  //waitForPress
   60,     //waitTimeoutInS
   2100,   //minBatteryLevel (Divide through around 700 to get voltage, so 3V should be save)
+  0x0010014C, //ofwFixValue - Magic bytes from OFW BL
   #ifdef NO_DEBUG_LOG
   false,  //serialLog
   #else
@@ -81,7 +82,13 @@ static void jsmn_obj_key(const char *key, size_t key_len, void *user_arg) {
     case 5:
       if (jsmn_hasIgnoreName())
         break;
-      if (strncmp(jsonGroupName, "ofw", 3) == 0
+      if (strcmp("general", jsonGroupName) == 0 && key_len == 2) {
+        if (jsonArrayId == 0)
+          Config_generalSettings.ofwFixValue = 0x00000000;
+        if (jsonArrayId < 4)
+          Config_generalSettings.ofwFixValue += xtob(key) << 8*jsonArrayId;
+        jsonArrayId++;
+      } else if (strncmp(jsonGroupName, "ofw", 3) == 0
             || strncmp(jsonGroupName, "cfw", 3)
             || strncmp(jsonGroupName, "add", 3))
       {

sd-bootloader-ng/bootmanager/config.h

@@ -23,6 +23,7 @@ typedef struct sGeneralSettings
   bool waitForPress;
   uint16_t waitTimeoutInS;
   uint16_t minBatteryLevel;
+  uint32_t ofwFixValue;
   bool serialLog;
   uint8_t logLevel;
   bool logColor;

sd-bootloader-ng/bootmanager/main.c

@@ -670,9 +670,9 @@ static bool prepareRun(sImageInfo* imageInfo, char* imagePath, uint32_t filesize
         || strnlen(creationDate, 29) == 28) //old format
       Logger_info(" creationDate=%s", creationDate);
 
-    Logger_debug("Apply OFW fix");
+    Logger_debug("Apply OFW fix 0x%08X", Config_generalSettings.ofwFixValue);
     if (*pCheck1 == 0xBEAC0005 && *pCheck1 == *pCheck2) {
-      *pTarget = 0x0010014C;
+      *pTarget = Config_generalSettings.ofwFixValue;
     } else {
       Logger_error("OFW fix failed");
       Logger_error(" *pCheck1=0x%X *pCheck2=0x%X *pTarget=0x%X", *pCheck1, *pCheck2, *pTarget);

sd-bootloader-ng/bootmanager/sd/revvox/boot/ngCfg.json

@@ -5,7 +5,7 @@
         "waitTimeoutInS": 60,
         "_descMinBatteryLevel": "Divide through around 700 to get voltage",
         "minBatteryLevel": 2100,
-
+        "ofwFixValue": ["4C", "01", "10", "00"],
         "_descSerialLog": "Logging only works with the debug build!",
         "serialLog": false,
         "_descLogLevel": "0:Trace - 5:Fatal",

wiki/Bootloader.md

@@ -42,6 +42,7 @@ The configuration for the bootloader is saved within [sd:/revvox/boot/ngCfg.json
 | waitForPress | Waits for an earpress on startup with a blink sequence (blue, green, cyan, black)| true, false | false |
 | waitTimeoutInS | Timeout in seconds for waitForPress if no earpress (hibernation) | 1-255 | 60 |
 | minBatteryLevel | Poweroff voltage to protect the battery. Divide through around 700 to get voltage (Standard 3V) | | 2100 |
+| ofwFixValue | Magic bytes to be placed into the OFW Image during boot (can be extracted from OFW BL data[-8:-4]) | hex array with 4 bytes | ["4C", "01", "10", "00"] |
 | serialLog | Enable log to UART (TX) @115200 baud. Only works for debug build! | true, false | true |
 | logLevel | Set Log level 0:Trace - 5:Fatal | 0-5 | DEBUG_LOG_LEVEL |
 | logColor | Enable colored log | true, false | false |