From 0b806285a7819397a5fede24cfdcf7c09d0caa1c Mon Sep 17 00:00:00 2001 From: Antonello Dettori Date: Sun, 26 Jun 2016 00:24:25 +0200 Subject: [PATCH] cbfstool: Require "-m ARCH" to extract payloads and stages Require the user to specify which architecture the payload/stage was built for before extracting it. Change-Id: I8ffe90a6af24e76739fd25456383a566edb0da7e Signed-off-by: Antonello Dettori Reviewed-on: https://review.coreboot.org/15438 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- util/cbfstool/cbfs_image.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 5142a7a7d8..1e38e4ea8b 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -966,6 +966,11 @@ static int cbfs_stage_make_elf(struct buffer *buff, uint32_t arch) size_t empty_sz; int rmod_ret; + if (arch == CBFS_ARCHITECTURE_UNKNOWN) { + ERROR("You need to specify -m ARCH.\n"); + return -1; + } + if (cbfs_stage_decompress(&stage, buff)) { ERROR("Failed to decompress stage.\n"); return -1; @@ -1047,6 +1052,11 @@ static int cbfs_payload_make_elf(struct buffer *buff, uint32_t arch) size_t empty_sz; int segments = 0; + if (arch == CBFS_ARCHITECTURE_UNKNOWN) { + ERROR("You need to specify -m ARCH.\n"); + return -1; + } + /* Count the number of segments inside buffer */ while (true) { uint32_t payload_type = 0;