summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel A Fernandes <joelagnel@ti.com>2012-09-18 04:30:51 +0000
committerTom Rini <trini@ti.com>2012-10-01 10:02:15 -0700
commit90207b626876ba18e6e6f70fe353f6e033b85197 (patch)
treebaef24f5ca42a50e5af7087c2aff86963561f898
parent7ac2fe2da21d292aeaf3af74e5c80de9ce9dab56 (diff)
downloadu-boot-imx-90207b626876ba18e6e6f70fe353f6e033b85197.zip
u-boot-imx-90207b626876ba18e6e6f70fe353f6e033b85197.tar.gz
u-boot-imx-90207b626876ba18e6e6f70fe353f6e033b85197.tar.bz2
am33xx: Fix fetching of mmc1 bootmode from bootrom for AM33XX
U-boot should not ignore getting the bootmode passed on from the bootrom. With this, U-boot SPL knows it was loaded from MMC1 and use this info to read full U-boot from MMC1 as well. Cc: pprakash@ti.com Cc: trini@ti.com Signed-off-by: Joel A Fernandes <joelagnel@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
-rw-r--r--arch/arm/cpu/armv7/omap-common/lowlevel_init.S5
-rw-r--r--arch/arm/include/asm/arch-am33xx/spl.h1
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
index 9766563..3581077 100644
--- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
@@ -27,6 +27,7 @@
*/
#include <asm/arch/omap.h>
+#include <asm/arch/spl.h>
#include <linux/linkage.h>
ENTRY(save_boot_params)
@@ -59,9 +60,9 @@ ENTRY(save_boot_params)
strb r2, [r3, #BOOT_DEVICE_OFFSET] @ spl_boot_device <- r1
/* boot mode is passed only for devices that can raw/fat mode */
- cmp r2, #2
+ cmp r2, #BOOT_DEVICE_XIP
blt 2f
- cmp r2, #7
+ cmp r2, #BOOT_DEVICE_MMC2
bgt 2f
/* Store the boot mode (raw/FAT) in omap_bootmode */
ldr r2, [r0, #DEV_DESC_PTR_OFFSET] @ get the device descriptor ptr
diff --git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h
index dc83882..63ed10b 100644
--- a/arch/arm/include/asm/arch-am33xx/spl.h
+++ b/arch/arm/include/asm/arch-am33xx/spl.h
@@ -23,6 +23,7 @@
#ifndef _ASM_ARCH_SPL_H_
#define _ASM_SPL_H_
+#define BOOT_DEVICE_XIP 2
#define BOOT_DEVICE_NAND 5
#define BOOT_DEVICE_MMC1 8
#define BOOT_DEVICE_MMC2 9 /* eMMC or daughter card */