From 207a6087b8858b635789ad8f5d14bd81d3095cd9 Mon Sep 17 00:00:00 2001
From: andy <andy@dixon.cx>
Date: Thu, 10 Sep 2026 23:43:41 +0100
Subject: [PATCH] Fix "Uncorr. value mismatch #[8-93]" install error on the
 full stack

The updater's option-byte validation (stage 8) compares the device OBs to the
manifest reference generated from scripts/ob.data, which is tuned for the LIGHT
stack (SFSA 0x080D7000, SBRV 0x0D7000>>2, and the SRAM2 secure boundaries).
Installing the FULL stack makes CPU2 move those boundaries (SFSA 0xCE, SBRV
0x0CE000>>2, ...), so validation fails right after the radio installs with
"Uncorr. value mismatch #[8-93]". These bytes are read-only (only CPU2 sets
them) and are correct once the radio install has succeeded, so comment the
CPU2-controlled secure-region OBs (SFSA, FSD, DDS, C2OPT, NBRSD, SNBRSA, BRSD,
SBRSA, SBRV) out of ob.data before the build. The user-controllable OBs (RDP,
BOR, boot config, watchdogs, PCROP, WRP) are still validated. Verified: the
regenerated manifest zeroes the SFSA/SBRV reference and compare mask; the full
suite still builds.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LEaD4ZeAfvWLBUxXp8G11r
---
 build.sh | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/build.sh b/build.sh
index fed476c..59ecd44 100755
--- a/build.sh
+++ b/build.sh
@@ -116,6 +116,33 @@ if changed:
 PY
 fi
 
+# Don't validate the CPU2-controlled secure-region option bytes against the
+# stock reference. The updater's OB validation stage compares device option
+# bytes to scripts/ob.data; that reference is tuned for the LIGHT stack (SFSA
+# 0x080D7000, SBRV 0x0D7000>>2). Installing the FULL stack makes CPU2 move the
+# secure boundary (SFSA -> 0xCE, SBRV -> 0x0CE000>>2, plus the SRAM2 secure
+# boundaries), so the compare fails with "Uncorr. value mismatch #[8-93]" right
+# after the radio installs. These bytes are read-only (only CPU2 sets them) and
+# are correct-by-construction once the radio install has succeeded, so exclude
+# them from the compare. The user-controllable OBs (RDP, BOR, boot config,
+# watchdogs, PCROP, WRP) are still validated. obdata.py skips '#'-commented lines.
+python3 - scripts/ob.data <<'PY'
+import sys
+p = sys.argv[1]
+secure = {"SFSA", "FSD", "DDS", "C2OPT", "NBRSD", "SNBRSA", "BRSD", "SBRSA", "SBRV"}
+out, changed = [], False
+for line in open(p).read().splitlines():
+    name = line.split(":", 1)[0].strip()
+    if name in secure and not line.startswith("#"):
+        out.append("# " + line + "  # Blue++: CPU2-set for full stack, not validated")
+        changed = True
+    else:
+        out.append(line)
+if changed:
+    open(p, "w").write("\n".join(out) + "\n")
+    print(">> patched " + p + ": exclude CPU2 secure-region OBs from validation")
+PY
+
 # Stage each app into applications_user, with the shared libble sources copied
 # alongside so the fap glob (*.c) picks them up.
 mkdir -p applications_user