From 28aca51bc82f7f13ce2a412883e1581d555a9398 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Thu, 26 Oct 2017 00:07:16 +0200
Subject: [PATCH] firmware: sign just the firmware part, not vendor header

---
 SConscript.firmware      | 5 +++--
 embed/firmware/memory.ld | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/SConscript.firmware b/SConscript.firmware
index 9b112c56d..180b1ec85 100644
--- a/SConscript.firmware
+++ b/SConscript.firmware
@@ -429,6 +429,7 @@ program_bin = env.Command(
     target='firmware.bin',
     source=program_elf,
     action=[
-        '$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET',
-        '$BINCTL $TARGET -s 1:2 `$COMBINE_SIGN firmware $TARGET 4747474747474747474747474747474747474747474747474747474747474747 4848484848484848484848484848484848484848484848484848484848484848`',
+        '$OBJCOPY -O binary -j .vendorheader -j .header -j .flash -j .data $SOURCE $TARGET',
+        '$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE build/firmware/firmware.bin.novhdr',
+        '$BINCTL $TARGET -s 1:2 `$COMBINE_SIGN firmware build/firmware/firmware.bin.novhdr 4747474747474747474747474747474747474747474747474747474747474747 4848484848484848484848484848484848484848484848484848484848484848`',
     ], )
diff --git a/embed/firmware/memory.ld b/embed/firmware/memory.ld
index ddc3a8ee9..326c64edb 100644
--- a/embed/firmware/memory.ld
+++ b/embed/firmware/memory.ld
@@ -33,8 +33,11 @@ _heap_start = ADDR(.heap);
 _heap_end = ADDR(.heap) + SIZEOF(.heap);
 
 SECTIONS {
-  .header : ALIGN(4) {
+  .vendorheader : ALIGN(4) {
     KEEP(*(.vendorheader))
+  } >FLASH AT>FLASH
+
+  .header : ALIGN(4) {
     KEEP(*(.header));
   } >FLASH AT>FLASH