From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 04/22] ARM: i.MX: bbu: Move inner-image type check
Date: Mon, 20 Aug 2018 23:25:45 -0700 [thread overview]
Message-ID: <20180821062603.17393-5-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180821062603.17393-1-andrew.smirnov@gmail.com>
Since imx_bbu_check_prereq() already uses file_detect_type() and we've
extended it to understand i.MX boot image file type, we can simplify a
bunch of repetitive code as follows:
1. Convert all checks from IVT_BARKER to filetype_imx_image_v2
check
2. Move all of the checking to be a part of imx_bbu_check_prereq()
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
arch/arm/mach-imx/imx-bbu-internal.c | 64 +++++++++++++++++-----------
1 file changed, 39 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c
index 67ae2961c..ea57b2772 100644
--- a/arch/arm/mach-imx/imx-bbu-internal.c
+++ b/arch/arm/mach-imx/imx-bbu-internal.c
@@ -106,11 +106,39 @@ err_close:
return ret;
}
-static int imx_bbu_check_prereq(const char *devicefile, struct bbu_data *data)
+static int imx_bbu_check_prereq(struct imx_internal_bbu_handler *imx_handler,
+ const char *devicefile, struct bbu_data *data,
+ enum filetype expected_type)
{
int ret;
-
- if (file_detect_type(data->image, data->len) != filetype_arm_barebox) {
+ const void *blob;
+ size_t len;
+ enum filetype type;
+
+ type = file_detect_type(data->image, data->len);
+
+ switch (type) {
+ case filetype_arm_barebox:
+ /*
+ * Specifying expected_type as unknow will disable the
+ * inner image type check
+ */
+ if (expected_type == filetype_unknown)
+ break;
+
+ blob = data->image + imx_handler->flash_header_offset;
+ len = data->len - imx_handler->flash_header_offset;
+ type = file_detect_type(blob, len);
+
+ if (type != expected_type) {
+ pr_err("Expected image type: %s, "
+ "detected image type: %s\n",
+ file_type_to_string(expected_type),
+ file_type_to_string(type));
+ return -EINVAL;
+ }
+ break;
+ default:
if (!bbu_force(data, "Not an ARM barebox image"))
return -EINVAL;
}
@@ -137,7 +165,8 @@ static int imx_bbu_internal_v1_update(struct bbu_handler *handler, struct bbu_da
container_of(handler, struct imx_internal_bbu_handler, handler);
int ret;
- ret = imx_bbu_check_prereq(data->devicefile, data);
+ ret = imx_bbu_check_prereq(imx_handler, data->devicefile, data,
+ filetype_unknown);
if (ret)
return ret;
@@ -319,8 +348,6 @@ out:
return ret;
}
-#define IVT_BARKER 0x402000d1
-
/*
* Update barebox on a v2 type internal boot (i.MX53)
*
@@ -333,19 +360,12 @@ static int imx_bbu_internal_v2_update(struct bbu_handler *handler, struct bbu_da
struct imx_internal_bbu_handler *imx_handler =
container_of(handler, struct imx_internal_bbu_handler, handler);
int ret;
- const uint32_t *barker;
- ret = imx_bbu_check_prereq(data->devicefile, data);
+ ret = imx_bbu_check_prereq(imx_handler, data->devicefile, data,
+ filetype_imx_image_v2);
if (ret)
return ret;
- barker = data->image + imx_handler->flash_header_offset;
-
- if (*barker != IVT_BARKER) {
- pr_err("Board does not provide DCD data and this image is no imximage\n");
- return -EINVAL;
- }
-
if (imx_handler->handler.flags & IMX_INTERNAL_FLAG_NAND)
ret = imx_bbu_internal_v2_write_nand_dbbt(imx_handler, data);
else
@@ -361,18 +381,10 @@ static int imx_bbu_internal_v2_mmcboot_update(struct bbu_handler *handler,
struct imx_internal_bbu_handler *imx_handler =
container_of(handler, struct imx_internal_bbu_handler, handler);
int ret;
- const uint32_t *barker;
char *bootpartvar;
const char *bootpart;
char *devicefile;
- barker = data->image + imx_handler->flash_header_offset;
-
- if (*barker != IVT_BARKER) {
- pr_err("Board does not provide DCD data and this image is no imximage\n");
- return -EINVAL;
- }
-
ret = asprintf(&bootpartvar, "%s.boot", data->devicefile);
if (ret < 0)
return ret;
@@ -389,7 +401,8 @@ static int imx_bbu_internal_v2_mmcboot_update(struct bbu_handler *handler,
if (ret < 0)
goto free_bootpartvar;
- ret = imx_bbu_check_prereq(devicefile, data);
+ ret = imx_bbu_check_prereq(imx_handler, devicefile, data,
+ filetype_imx_image_v2);
if (ret)
goto free_devicefile;
@@ -414,7 +427,8 @@ static int imx_bbu_external_update(struct bbu_handler *handler, struct bbu_data
container_of(handler, struct imx_internal_bbu_handler, handler);
int ret;
- ret = imx_bbu_check_prereq(data->devicefile, data);
+ ret = imx_bbu_check_prereq(imx_handler, data->devicefile, data,
+ filetype_unknown);
if (ret)
return ret;
--
2.17.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-08-21 6:26 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-21 6:25 [PATCH 00/22] i.MX BBU improvements and bugfixes Andrey Smirnov
2018-08-21 6:25 ` [PATCH 01/22] ARM: i.MX: bbu: Remove unused define Andrey Smirnov
2018-08-21 6:25 ` [PATCH 02/22] filetype: Add code to detect i.MX image v1 Andrey Smirnov
2018-08-21 10:07 ` Roland Hieber
2018-08-21 20:23 ` Andrey Smirnov
2018-08-23 9:33 ` Roland Hieber
2018-08-23 21:01 ` Andrey Smirnov
2018-08-21 6:25 ` [PATCH 03/22] filetype: Add code to detect i.MX image v2 Andrey Smirnov
2018-08-21 6:25 ` Andrey Smirnov [this message]
2018-08-22 6:49 ` [PATCH 04/22] ARM: i.MX: bbu: Move inner-image type check Sascha Hauer
2018-08-22 6:52 ` Sascha Hauer
2018-08-23 0:06 ` Andrey Smirnov
2018-08-23 6:44 ` Sascha Hauer
2018-08-21 6:25 ` [PATCH 05/22] ARM: i.MX: bbu: Drop IMX_INTERNAL_FLAG_NAND Andrey Smirnov
2018-08-21 6:25 ` [PATCH 06/22] ARM: i.MX: bbu: Consolidate vairous update helpers Andrey Smirnov
2018-08-22 6:52 ` Sascha Hauer
2018-08-23 0:07 ` Andrey Smirnov
2018-08-21 6:25 ` [PATCH 07/22] ARM: i.MX: bbu: Simplify imx53_bbu_internal_nand_register_handler() Andrey Smirnov
2018-08-21 6:25 ` [PATCH 08/22] ARM: i.MX: bbu: Constify all 'devicefile' arguments Andrey Smirnov
2018-08-21 6:25 ` [PATCH 09/22] ARM: i.MX: bbu: Detect which platforms need v2 i.MX header Andrey Smirnov
2018-08-21 6:25 ` [PATCH 10/22] ARM: i.MX: bbu: Alias imx5*_bbu_internal_mmc_register_handler() Andrey Smirnov
2018-08-21 6:25 ` [PATCH 11/22] ARM: i.MX: bbu: Alias imx5*_bbu_internal_spi_i2c_register_handler() Andrey Smirnov
2018-08-21 6:25 ` [PATCH 12/22] ARM: i.MX: bbu: Move protect code into a separate routine Andrey Smirnov
2018-08-21 6:25 ` [PATCH 13/22] ARM: i.MX: bbu: Adjust FLASH_HEADER_OFFSET_MMC for i.MX8MQ Andrey Smirnov
2018-08-21 6:25 ` [PATCH 14/22] ARM: i.MX: bbu: Add support for SPI/I2C on VFxxx Andrey Smirnov
2018-08-21 6:25 ` [PATCH 15/22] ARM: i.MX: zii-vf610-dev-rev-b/c: Add support for BBU on SPI-NOR Andrey Smirnov
2018-08-21 6:25 ` [PATCH 16/22] ARM: i.MX: bbu: Add support for MMC on i.MX8MQ Andrey Smirnov
2018-08-21 6:25 ` [PATCH 17/22] ARM: nxp-imx8mq-evk: Add eMMC BBU configuration Andrey Smirnov
2018-08-21 6:25 ` [PATCH 18/22] ARM: i.MX: bbu: Adjust error code check for pwrite() Andrey Smirnov
2018-08-22 7:01 ` Sascha Hauer
2018-08-23 0:16 ` Andrey Smirnov
2018-08-21 6:26 ` [PATCH 19/22] bbu: Remove logical negation in barebox_update_handler_exists() Andrey Smirnov
2018-08-22 7:09 ` Sascha Hauer
2018-08-23 0:01 ` Andrey Smirnov
2018-08-23 4:43 ` Sam Ravnborg
2018-08-23 6:42 ` Sascha Hauer
2018-08-23 6:48 ` Andrey Smirnov
2018-08-21 6:26 ` [PATCH 20/22] block: Do not ignore error in blk->ops->write() Andrey Smirnov
2018-08-21 6:26 ` [PATCH 21/22] bbu: Report update failures explicitly Andrey Smirnov
2018-08-21 6:26 ` [PATCH 22/22] bbu: command: Make sure specified update handler exists Andrey Smirnov
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=20180821062603.17393-5-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--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