summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-layerscape/xload.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-layerscape/xload.c')
-rw-r--r--arch/arm/mach-layerscape/xload.c24
1 files changed, 21 insertions, 3 deletions
diff --git a/arch/arm/mach-layerscape/xload.c b/arch/arm/mach-layerscape/xload.c
index 54495d7f97..32ff158b1b 100644
--- a/arch/arm/mach-layerscape/xload.c
+++ b/arch/arm/mach-layerscape/xload.c
@@ -2,21 +2,39 @@
#include <common.h>
#include <bootsource.h>
-#include <mach/layerscape.h>
-#include <mach/xload.h>
+#include <mach/layerscape/layerscape.h>
+#include <mach/layerscape/xload.h>
int ls1046a_xload_start_image(unsigned long r0, unsigned long r1,
unsigned long r2)
{
enum bootsource src;
- src = ls1046_bootsource_get();
+ src = ls1046a_bootsource_get();
switch (src) {
case BOOTSOURCE_SPI_NOR:
return ls1046a_qspi_start_image(r0, r1, r2);
+#if defined(CONFIG_MCI_IMX_ESDHC_PBL)
case BOOTSOURCE_MMC:
return ls1046a_esdhc_start_image(r0, r1, r2);
+#endif
+ default:
+ pr_err("Unknown bootsource\n");
+ return -EINVAL;
+ }
+}
+
+int ls1021a_xload_start_image(unsigned long r0, unsigned long r1,
+ unsigned long r2)
+{
+ enum bootsource src;
+
+ src = ls1021a_bootsource_get();
+
+ switch (src) {
+ case BOOTSOURCE_SPI_NOR:
+ return ls1021a_qspi_start_image(r0, r1, r2);
default:
pr_err("Unknown bootsource\n");
return -EINVAL;