From patchwork Wed Jan 29 14:50:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Johnson X-Patchwork-Id: 240458 List-Id: U-Boot discussion From: mrjoel at lixil.net (Joel Johnson) Date: Wed, 29 Jan 2020 07:50:12 -0700 Subject: [PATCH v2 5/5] cmd: mvebu: bubt: show image boot device In-Reply-To: <20200129145013.125237-1-mrjoel@lixil.net> References: <20200129145013.125237-1-mrjoel@lixil.net> Message-ID: <20200129145013.125237-5-mrjoel@lixil.net> When a mismatch is found trying to write an image for one boot method to a different boot device, print an error message including the image header marked target boot device type. Signed-off-by: Joel Johnson Reviewed-by: Stefan Roese --- v2 changes: - newly added in v2 series --- cmd/mvebu/bubt.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index 78061a6a2d..5e2877788a 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -678,6 +678,17 @@ static int a38x_check_boot_mode(const struct bubt_dev *dst) if (a38x_boot_modes[mode].id == hdr->blockid) return 0; + for (int i = 0; i < A38X_BOOT_MODE_MAX; i++) { + if (a38x_boot_modes[i].id == hdr->blockid) { + printf("Error: image meant to be booted from " + " \"%s\", not \"%s\"!\n", + a38x_boot_modes[i].name, dst->name); + return -ENOEXEC; + } + } + + printf("Error: unknown boot device in image header: 0x%x\n", + hdr->blockid); return -ENOEXEC; } @@ -747,10 +758,8 @@ static int bubt_verify(const struct bubt_dev *dst) #if defined(CONFIG_ARMADA_38X) err = a38x_check_boot_mode(dst); - if (err) { - puts("Error: image not built for destination device!\n"); + if (err) return err; - } #endif return 0;