From 3da46db507b23e6dfb1ffaa033fa3f7392f1437e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 21 Apr 2017 19:25:45 +0200 Subject: [PATCH] fiptool: Add Amlogic BL301 UUID and command line option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The --blob uuid=AABBCCDD-ABCD-EFEF-ABCD-12345678ABCD,file=... option places this custom TOC entry last. This is because pack_images() walks through the list of image descriptions sequentially, and the --blob option appends to the end of the list in create_cmd(). The command line order of options is thereby not taken into account. But firmware blobs expect a load offset resulting from ordering bl301 between bl30 (aka scp-fw) and bl31 (soc-fw). Therefore add an entry to toc_entries[] for usage by fill_image_descs(). Place the UUID inline to avoid mistaking it for anything official, and name the commandline option "amlogic-scp-task-fw". See afaerber/meson-tools#3 for more background. Signed-off-by: Andreas Färber --- tools/fiptool/tbbr_config.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/fiptool/tbbr_config.c b/tools/fiptool/tbbr_config.c index 7e5e0a35221..07e49ce6e99 100644 --- a/tools/fiptool/tbbr_config.c +++ b/tools/fiptool/tbbr_config.c @@ -65,6 +65,11 @@ toc_entry_t toc_entries[] = { .uuid = UUID_SCP_FIRMWARE_SCP_BL2, .cmdline_name = "scp-fw" }, + { + .name = "Amlogic SCP User Task Firmware BL301", + .uuid = { 0xAABBCCDD, 0xABCD, 0xEFEF, 0xAB, 0xCD, { 0x12, 0x34, 0x56, 0x78, 0xAB, 0xCD } }, + .cmdline_name = "amlogic-scp-task-fw", + }, { .name = "EL3 Runtime Firmware BL31", .uuid = UUID_EL3_RUNTIME_FIRMWARE_BL31,