Signed-off-by: Marc Kleine-Budde <[email protected]>
---
 scripts/imx/imx-image.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index 1c032a3cb142..b3c77927b555 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -34,6 +34,7 @@
 
 #define MAX_DCD 1024
 #define HEADER_LEN 0x1000      /* length of the blank area + IVT + DCD */
+#define CSF_LEN 0x2000         /* length of the CSF (needed for HAB) */
 
 static uint32_t image_load_addr;
 static uint32_t image_dcd_offset;
@@ -42,6 +43,7 @@ static int curdcd;
 static int header_version;
 static int cpu_type;
 static int add_barebox_header;
+static int prepare_sign;
 
 /*
  * ============================================================================
@@ -195,6 +197,11 @@ static int add_header_v2(void *buf, int offset, uint32_t 
loadaddr, uint32_t imag
        hdr->boot_data.start    = loadaddr;
        hdr->boot_data.size     = imagesize;
 
+       if (prepare_sign) {
+               hdr->csf = loadaddr + imagesize;
+               hdr->boot_data.size += CSF_LEN;
+       }
+
        hdr->dcd_header.tag     = TAG_DCD_HEADER;
        hdr->dcd_header.length  = htobe16(sizeof(uint32_t) + dcdsize);
        hdr->dcd_header.version = DCD_VERSION;
@@ -215,6 +222,7 @@ static void usage(const char *prgname)
                "-b           add barebox header to image. If used, barebox 
recognizes\n"
                "             the image as regular barebox image which can be 
used as\n"
                "             second stage image\n"
+               "-p           prepare image for signing\n"
                "-h           this help\n", prgname);
        exit(1);
 }
@@ -656,7 +664,7 @@ int main(int argc, char *argv[])
        int dcd_only = 0;
        int now = 0;
 
-       while ((opt = getopt(argc, argv, "c:hf:o:bd")) != -1) {
+       while ((opt = getopt(argc, argv, "c:hf:o:bdp")) != -1) {
                switch (opt) {
                case 'c':
                        configfile = optarg;
@@ -673,6 +681,9 @@ int main(int argc, char *argv[])
                case 'd':
                        dcd_only = 1;
                        break;
+               case 'p':
+                       prepare_sign = 1;
+                       break;
                case 'h':
                        usage(argv[0]);
                default:
-- 
2.1.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Reply via email to