[realtek-ambz2] Fix OTA build failures (include order + public key escaping) (#345)

* Fix include order in lt_ota.c for compilation

* Write public key to header file instead of command line

* simplify to just use braces and replace inline

* Separate include groups

---------

Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>

Author: bdraco

builder/family/realtek-ambz2.py

@@ -25,9 +25,10 @@ def get_public_key(private: bytes) -> bytes:
     return key.public_key()
 
 
-def encode_for_define(data: bytes) -> str:
-    # use C array initializer syntax to avoid shell escaping issues on Windows
-    return "{" + ",".join(f"0x{byte:02x}" for byte in data) + "}"
+def encode_public_key(data: bytes) -> str:
+    # Output without braces - the C code wraps it in braces
+    # This avoids shell escaping issues with {} on different platforms
+    return ",".join(f"0x{byte:02x}" for byte in data)
 
 
 public_key_bytes = get_public_key(ImageConfig(**board.get("image")).keys.decryption)
@@ -56,7 +57,7 @@ def encode_for_define(data: bytes) -> str:
         ("__ARM_ARCH_8M_MAIN__", "1"),
         ("CONFIG_BUILD_RAM", "1"),
         "V8M_STKOVF",
-        ("IMAGE_PUBLIC_KEY", encode_for_define(public_key_bytes)),
+        ("IMAGE_PUBLIC_KEY", encode_public_key(public_key_bytes)),
     ],
     CPPPATH=[
         # allow including <ctype.h> from GCC instead of RTL SDK

cores/realtek-ambz2/base/api/lt_ota.c

@@ -1,19 +1,20 @@
 /* Copyright (c) Martin Prokopič 2024-12-03. */
 
-#include <device_lock.h>
 #include <libretiny.h>
-#include <osdep_service.h>
 #include <sdk_private.h>
 
+#include <device_lock.h>
+#include <osdep_service.h>
+
 // from SDK
 extern uint32_t sys_update_ota_get_curr_fw_idx(void);
 
 #define FLASH_SECTOR_SIZE		0x1000
-// IMAGE_PUBLIC_KEY is defined by the build script as an array initializer
 #define IMAGE_PUBLIC_KEY_OFFSET 32
 #define IMAGE_PUBLIC_KEY_LENGTH 32
 
-static const uint8_t lt_image_public_key[] = IMAGE_PUBLIC_KEY;
+// IMAGE_PUBLIC_KEY is defined by build script without braces to avoid shell escaping issues
+static const uint8_t lt_image_public_key[] = {IMAGE_PUBLIC_KEY};
 
 typedef enum {
 	INVALID	 = 0,