diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-09-18 15:22:55 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-09-19 09:55:42 +0200 |
| commit | f9e95e2e907eb9c112ae7a1dc65f5371946a6d23 (patch) | |
| tree | d1befe1c2f1b893732f5c5ffea88966321f79e3b /arch | |
| parent | e6b0633b51f9cacb0f0e649e44a56dce50883d8d (diff) | |
| download | barebox-f9e95e2e907eb9c112ae7a1dc65f5371946a6d23.tar.gz barebox-f9e95e2e907eb9c112ae7a1dc65f5371946a6d23.tar.xz | |
ARM: i.MX: bbu: Add support for v1 header to MMC boot handler
Convert imx_bbu_internal_v2_mmcboot_update() to use imx_bbu_update()
for actual update in order to be able to support v1 as well as v2
headers. While at it rename the function to
imx_bbu_internal_mmcboot_update() to reflect that change.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/imx-bbu-internal.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c index 504e359bc3..a283b7c5c1 100644 --- a/arch/arm/mach-imx/imx-bbu-internal.c +++ b/arch/arm/mach-imx/imx-bbu-internal.c @@ -401,11 +401,10 @@ static int imx_bbu_update(struct bbu_handler *handler, struct bbu_data *data) return imx_handler->write_device(imx_handler, data); } -static int imx_bbu_internal_v2_mmcboot_update(struct bbu_handler *handler, - struct bbu_data *data) +static int imx_bbu_internal_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); + struct bbu_data _data = *data; int ret; char *bootpartvar; const char *bootpart; @@ -427,16 +426,14 @@ static int imx_bbu_internal_v2_mmcboot_update(struct bbu_handler *handler, if (ret < 0) goto free_bootpartvar; - ret = imx_bbu_check_prereq(imx_handler, devicefile, data, - filetype_imx_image_v2); + _data.devicefile = devicefile; + + ret = imx_bbu_update(handler, &_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); + /* on success switch boot source */ + ret = setenv(bootpartvar, bootpart); free_devicefile: free(devicefile); @@ -586,20 +583,25 @@ int imx8mq_bbu_internal_mmc_register_handler(const char *name, * Note that no further partitioning of the boot partition is supported up to * now. */ -int imx6_bbu_internal_mmcboot_register_handler(const char *name, - const char *devicefile, - unsigned long flags) +static int imx_bbu_internal_mmcboot_register_handler(const char *name, + const char *devicefile, + unsigned long flags) { struct imx_internal_bbu_handler *imx_handler; imx_handler = __init_handler(name, devicefile, flags); imx_handler->flash_header_offset = imx_bbu_flash_header_offset_mmc(); - imx_handler->handler.handler = imx_bbu_internal_v2_mmcboot_update; + imx_handler->handler.handler = imx_bbu_internal_mmcboot_update; return __register_handler(imx_handler); } +int imx6_bbu_internal_mmcboot_register_handler(const char *name, + const char *devicefile, + unsigned long flags) + __alias(imx_bbu_internal_mmcboot_register_handler); + /* * Register an i.MX53 internal boot update handler for i2c/spi * EEPROMs / flashes. Nearly the same as MMC/SD, but we do not need to |