From: Marc Kleine-Budde <mkl@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v3 1/3] imx-image: add option to prepare image for HAB signing
Date: Mon, 13 Apr 2015 14:27:01 +0200 [thread overview]
Message-ID: <1428928023-13401-2-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1428928023-13401-1-git-send-email-mkl@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
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 cff1997573ac..25ea4d8d1b94 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -33,6 +33,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;
@@ -41,6 +42,7 @@ static int curdcd;
static int header_version;
static int cpu_type;
static int add_barebox_header;
+static int prepare_sign;
/*
* ============================================================================
@@ -194,6 +196,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;
@@ -214,6 +221,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);
}
@@ -655,7 +663,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;
@@ -672,6 +680,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
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-04-13 12:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 12:27 [PATCH v3 0/3] add habv4 support for i.MX6 Marc Kleine-Budde
2015-04-13 12:27 ` Marc Kleine-Budde [this message]
2015-04-13 12:27 ` [PATCH v3 2/3] images: add HABv4 " Marc Kleine-Budde
2015-04-13 12:27 ` [PATCH v3 3/3] habv4: add High Assurance Boot v4 Marc Kleine-Budde
2015-04-15 5:12 ` [PATCH v3 0/3] add habv4 support for i.MX6 Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428928023-13401-2-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox