Skip to content

Commit

Permalink
fiptool: Add Amlogic BL301 UUID and command line option
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
afaerber authored and n-hys committed Jul 30, 2021
1 parent 0a6701d commit 9f8e816
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions tools/fiptool/tbbr_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ toc_entry_t toc_entries[] = {
.uuid = UUID_SCP_FIRMWARE_SCP_BL2,
.cmdline_name = "scp-fw"
},
{
.name = "Amlogic SCP User Task Firmware BL301",
.uuid = {{0xdd, 0xcc, 0xbb, 0xaa}, {0xcd, 0xab}, {0xef, 0xef}, 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,
Expand Down

0 comments on commit 9f8e816

Please sign in to comment.