[PATCH] fixup! mvebu: create bbu handler for kwb images and use it on cubox

Sascha Hauer s.hauer at pengutronix.de
Wed Jun 13 01:28:14 PDT 2018


On Tue, Jun 12, 2018 at 07:42:14AM +0200, Uwe Kleine-König wrote:
> ---
>  arch/arm/mach-mvebu/Makefile           | 2 +-
>  arch/arm/mach-mvebu/include/mach/bbu.h | 9 +++++++++
>  2 files changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
> index cc2b926438e4..6079403b83dd 100644

Applied, thanks

Sascha

> --- a/arch/arm/mach-mvebu/Makefile
> +++ b/arch/arm/mach-mvebu/Makefile
> @@ -1,8 +1,8 @@
>  obj-pbl-y			+= common.o
> -obj-y				+= kwb_bbu.o
>  obj-$(CONFIG_ARCH_ARMADA_370)	+= armada-370-xp.o
>  obj-$(CONFIG_ARCH_ARMADA_XP)	+= armada-370-xp.o
>  obj-$(CONFIG_ARCH_ARMADA_38X)	+= armada-370-xp.o
>  obj-$(CONFIG_ARCH_DOVE)		+= dove.o
>  obj-$(CONFIG_ARCH_KIRKWOOD)	+= kirkwood.o
> +obj-$(CONFIG_BAREBOX_UPDATE)	+= kwb_bbu.o
>  obj-$(CONFIG_BOOTM)		+= kwbootimage.o
> diff --git a/arch/arm/mach-mvebu/include/mach/bbu.h b/arch/arm/mach-mvebu/include/mach/bbu.h
> index f1021e52ce9f..a06db2b1442e 100644
> --- a/arch/arm/mach-mvebu/include/mach/bbu.h
> +++ b/arch/arm/mach-mvebu/include/mach/bbu.h
> @@ -1,3 +1,12 @@
> +#ifdef CONFIG_BAREBOX_UPDATE
>  int mvebu_bbu_flash_register_handler(const char *name,
>  				     char *devicefile, int version,
>  				     bool isdefault);
> +#else
> +int mvebu_bbu_flash_register_handler(const char *name,
> +                                     char *devicefile, int version,
> +                                     bool isdefault)
> +{
> +	return -ENOSYS;
> +}
> +#endif
> -- 
> 2.17.1
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



More information about the barebox mailing list