From 691b688f46999142ca4e8d2d88432c679a127958 Mon Sep 17 00:00:00 2001
From: jjwbruijn <mail@jelmerbruijn.nl>
Date: Fri, 16 Feb 2024 01:17:11 +0100
Subject: [PATCH] added magic numbers to M2 7.5"

---
 ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/.gitignore   |  2 +-
 ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/main.cpp     | 14 ++++++++++++--
 .../88MZ100_OpenEpaperLink_7.4/mz100/mz100.ld      |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/.gitignore b/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/.gitignore
index c18d7853..86349601 100644
--- a/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/.gitignore
+++ b/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/.gitignore
@@ -1,4 +1,4 @@
 build
 *.axf
 # Allow 
-!*.bin
+#!*.bin
diff --git a/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/main.cpp b/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/main.cpp
index 4d1b3127..4c58c9ad 100644
--- a/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/main.cpp
+++ b/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/main.cpp
@@ -46,10 +46,10 @@ extern void dump(const uint8_t *a, const uint16_t l);
 #include "oepl_fs.h"
 
 #define SW_VER_CURRENT (0x0000011300000000ull)  // top 16 bits are off limits, xxxx.VV.tt.vvvv.mmmm means version V.t.v.m
-#define SW_DEFAULT_MAC (0x0000000000000014ull)
+#define FW_MAGIC (0x14AFEEBCDC14AE5Aull)
 
 uint64_t __attribute__((section(".ver"))) mCurVersionExport = SW_VER_CURRENT;
-uint64_t __attribute__((section(".default_mac"))) default_mac = SW_DEFAULT_MAC;
+uint64_t __attribute__((section(".fwmagic"))) magic = FW_MAGIC;
 
 char macStr[32];
 char macStr1[32];
@@ -543,6 +543,16 @@ void applyUpdate(uint32_t size) {
     setupCLKCalib();
     setupRTC(0);
 
+
+    uint64_t test;
+    FLASH_Read((FLASH_ReadMode_Type)0, fsEnd + 0x0168, (uint8_t *)&test, 8);
+    if (test != magic) {
+        printf("Update didn't have the correct magic number!\n");
+        printf("got %llu\n", test);
+        delay(1000);
+        return;
+    }
+
     showApplyUpdate();
 
     printf("Applying update\r\n");
diff --git a/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/mz100/mz100.ld b/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/mz100/mz100.ld
index 415f8098..8157b753 100644
--- a/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/mz100/mz100.ld
+++ b/ARM_Tag_FW/88MZ100_OpenEpaperLink_7.4/mz100/mz100.ld
@@ -17,7 +17,7 @@ SECTIONS
     {
         KEEP(*(.isr_vector))
         KEEP(*(.ver))
-        KEEP(*(.default_mac))
+        KEEP(*(.fwmagic))
         *(.text*)
 
         KEEP(*(.init))