diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-09 09:29:17 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-10 08:18:25 +0200 |
commit | f475365f4eb83dfc00a424505995ee3777cc75e1 (patch) | |
tree | 21915b07605d66cfb8b495fc62608d9b11cf7c80 /arch | |
parent | 18afb284dc1c355c29c6b6d4368cb63efa834a2a (diff) | |
download | barebox-f475365f4eb83dfc00a424505995ee3777cc75e1.tar.gz barebox-f475365f4eb83dfc00a424505995ee3777cc75e1.tar.xz |
ARM: Layerscape: ls1046a: Add automatic bootsource detection xload function
Add a helper function which continues booting from the detected
boot source.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-layerscape/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-layerscape/include/mach/xload.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-layerscape/xload.c | 24 |
3 files changed, 27 insertions, 1 deletions
diff --git a/arch/arm/mach-layerscape/Makefile b/arch/arm/mach-layerscape/Makefile index 4705154fb1..73cd61a7cf 100644 --- a/arch/arm/mach-layerscape/Makefile +++ b/arch/arm/mach-layerscape/Makefile @@ -3,4 +3,4 @@ lwl-y += lowlevel.o errata.o lwl-$(CONFIG_ARCH_LS1046) += lowlevel-ls1046a.o obj-y += icid.o obj-pbl-y += boot.o -pbl-y += xload-qspi.o +pbl-y += xload-qspi.o xload.o diff --git a/arch/arm/mach-layerscape/include/mach/xload.h b/arch/arm/mach-layerscape/include/mach/xload.h index 94756ed13d..eb2d998865 100644 --- a/arch/arm/mach-layerscape/include/mach/xload.h +++ b/arch/arm/mach-layerscape/include/mach/xload.h @@ -4,5 +4,7 @@ int ls1046a_esdhc_start_image(unsigned long r0, unsigned long r1, unsigned long r2); int ls1046a_qspi_start_image(unsigned long r0, unsigned long r1, unsigned long r2); +int ls1046a_xload_start_image(unsigned long r0, unsigned long r1, + unsigned long r2); #endif /* __MACH_XLOAD_H */ diff --git a/arch/arm/mach-layerscape/xload.c b/arch/arm/mach-layerscape/xload.c new file mode 100644 index 0000000000..54495d7f97 --- /dev/null +++ b/arch/arm/mach-layerscape/xload.c @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <common.h> +#include <bootsource.h> +#include <mach/layerscape.h> +#include <mach/xload.h> + +int ls1046a_xload_start_image(unsigned long r0, unsigned long r1, + unsigned long r2) +{ + enum bootsource src; + + src = ls1046_bootsource_get(); + + switch (src) { + case BOOTSOURCE_SPI_NOR: + return ls1046a_qspi_start_image(r0, r1, r2); + case BOOTSOURCE_MMC: + return ls1046a_esdhc_start_image(r0, r1, r2); + default: + pr_err("Unknown bootsource\n"); + return -EINVAL; + } +} |