From: "Uwe Kleine-König" <uwe@kleine-koenig.org>
To: barebox@lists.infradead.org
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: [PATCH 2/3] ARM: i.MX: bbu-internal: new handler to make use of mmc boot partitions
Date: Wed, 18 Oct 2017 15:41:16 +0200 [thread overview]
Message-ID: <20171018134117.20289-2-uwe@kleine-koenig.org> (raw)
In-Reply-To: <20171018134117.20289-1-uwe@kleine-koenig.org>
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
This handler updates the non-active MMC boot partition and after a
successful update makes the updated partition the active one. This way
the machine should continue to be bootable when the update fails.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
arch/arm/mach-imx/imx-bbu-internal.c | 71 ++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c
index 254ccb6369e6..c8a8b5b689fc 100644
--- a/arch/arm/mach-imx/imx-bbu-internal.c
+++ b/arch/arm/mach-imx/imx-bbu-internal.c
@@ -29,6 +29,7 @@
#include <linux/mtd/mtd-abi.h>
#include <linux/stat.h>
#include <ioctl.h>
+#include <environment.h>
#include <mach/bbu.h>
#define FLASH_HEADER_OFFSET_MMC 0x400
@@ -369,6 +370,63 @@ static int imx_bbu_internal_v2_update(struct bbu_handler *handler, struct bbu_da
return ret;
}
+static int imx_bbu_internal_v2_mmcboot_update(struct bbu_handler *handler,
+ struct bbu_data *data)
+{
+ struct imx_internal_bbu_handler *imx_handler =
+ container_of(handler, struct imx_internal_bbu_handler, handler);
+ int ret;
+ uint32_t *barker;
+ char *bootpartvar;
+ const char *bootpart;
+ char *devicefile;
+
+ barker = data->image + imx_handler->flash_header_offset;
+
+ if (*barker != IVT_BARKER) {
+ printf("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) {
+ printf("Failed to allocate string for boot variable\n");
+ return ret;
+ }
+
+ bootpart = getenv(bootpartvar);
+
+ if (!strcmp(bootpart, "boot0")) {
+ bootpart = "boot1";
+ } else {
+ bootpart = "boot0";
+ }
+
+ ret = asprintf(&devicefile, "/dev/%s.%s", data->devicefile, bootpart);
+ if (ret < 0) {
+ printf("Failed to allocate string for boot partition device file\n");
+ goto free_bootpartvar;
+ }
+
+ ret = imx_bbu_check_prereq(devicefile, data);
+ if (ret)
+ goto free_devicefile;
+
+ ret = imx_bbu_write_device(imx_handler, devicefile, data, data->image, data->len);
+
+ if (!ret)
+ /* on success switch boot source */
+ ret = setenv(bootpartvar, bootpart);
+
+free_devicefile:
+ free(devicefile);
+
+free_bootpartvar:
+ free(bootpartvar);
+
+ return ret;
+}
+
static int imx_bbu_external_update(struct bbu_handler *handler, struct bbu_data *data)
{
struct imx_internal_bbu_handler *imx_handler =
@@ -498,6 +556,19 @@ int imx6_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
return __register_handler(imx_handler);
}
+int imx6_bbu_internal_mmcboot_register_handler(const char *name, char *devicefile,
+ unsigned long flags)
+{
+ struct imx_internal_bbu_handler *imx_handler;
+
+ imx_handler = __init_handler(name, devicefile, flags);
+ imx_handler->flash_header_offset = FLASH_HEADER_OFFSET_MMC;
+
+ imx_handler->handler.handler = imx_bbu_internal_v2_mmcboot_update;
+
+ return __register_handler(imx_handler);
+}
+
/*
* Register a i.MX53 internal boot update handler for i2c/spi
* EEPROMs / flashes. Nearly the same as MMC/SD, but we do not need to
--
2.14.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2017-10-18 13:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-18 13:41 [PATCH 1/3] ARM: i.MX: bbu-internal: make filename for device to write to adaptable Uwe Kleine-König
2017-10-18 13:41 ` Uwe Kleine-König [this message]
2017-10-23 7:20 ` [PATCH 2/3] ARM: i.MX: bbu-internal: new handler to make use of mmc boot partitions Sascha Hauer
2017-10-23 7:54 ` Uwe Kleine-König
2017-10-18 13:41 ` [PATCH 3/3] ARM: i.MX: bbu-internal: update board files to make use of new bbu handler Uwe Kleine-König
2017-10-23 7:23 ` Sascha Hauer
2017-10-23 7:55 ` Uwe Kleine-König
2017-10-23 8:05 ` Sascha Hauer
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=20171018134117.20289-2-uwe@kleine-koenig.org \
--to=uwe@kleine-koenig.org \
--cc=barebox@lists.infradead.org \
--cc=u.kleine-koenig@pengutronix.de \
/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