summaryrefslogtreecommitdiff
path: root/common/firmware_image.S
diff options
context:
space:
mode:
Diffstat (limited to 'common/firmware_image.S')
-rw-r--r--common/firmware_image.S19
1 files changed, 16 insertions, 3 deletions
diff --git a/common/firmware_image.S b/common/firmware_image.S
index 1fa4f25f71..97a7123f49 100644
--- a/common/firmware_image.S
+++ b/common/firmware_image.S
@@ -8,12 +8,15 @@
#include "config.h"
-#define FW_FILE(builddir,proj,sect,suffix) \
- builddir##/##sect##/##proj##.##sect##suffix##.flat
+#define FW_FILE(builddir,proj,sect,suffix,ext) \
+ builddir##/##sect##/##proj##.##sect##suffix##.flat##ext
+
#define STRINGIFY0(name) #name
#define STRINGIFY(name) STRINGIFY0(name)
#define FW_IMAGE(sect,suffix) \
- STRINGIFY(FW_FILE(FINAL_OUTDIR,PROJECT,sect,suffix))
+ STRINGIFY(FW_FILE(FINAL_OUTDIR,PROJECT,sect,suffix,))
+#define FW_IMAGE_SIGN(sect,suffix) \
+ STRINGIFY(FW_FILE(FINAL_OUTDIR,PROJECT,sect,suffix,.sig))
/* Read Only firmware */
#ifdef CONFIG_FW_INCLUDE_RO
@@ -21,6 +24,11 @@
.incbin FW_IMAGE(RO,)
#endif
+#ifdef CONFIG_RWSIG_TYPE_RWSIG
+.section .image.RO.key, "a"
+.incbin STRINGIFY(FINAL_OUTDIR/key.vbpubk2)
+#endif
+
/* Shared objects library */
#ifdef CONFIG_SHAREDLIB
.section .image.libsharedobjs, "ax"
@@ -31,6 +39,11 @@
.section .image.RW, "ax"
.incbin FW_IMAGE(RW,)
+#ifdef CONFIG_RWSIG_TYPE_RWSIG
+.section .image.RW.sign, "a"
+.incbin FW_IMAGE_SIGN(RW,)
+#endif
+
#ifdef CONFIG_RW_B
.section .image.RW_B, "ax"
.incbin FW_IMAGE(RW,_B)