leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am33xx: Fix fetching of mmc1 bootmode from bootrom for AM33XX

Browse Source 
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>
This commit is contained in:
Joel A Fernandes 2012-09-18 04:30:51 +00:00 committed by Tom Rini
parent 7ac2fe2da2
commit 90207b6268
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/cpu/armv7/omap-common/lowlevel_init.S
View File

@ -27,6 +27,7 @@
*/ */
#include <asm/arch/omap.h> #include <asm/arch/omap.h>
#include <asm/arch/spl.h>
#include <linux/linkage.h> #include <linux/linkage.h>
ENTRY(save_boot_params) ENTRY(save_boot_params)
@ -59,9 +60,9 @@ ENTRY(save_boot_params)
strb r2, [r3, #BOOT_DEVICE_OFFSET] @ spl_boot_device <- r1 strb r2, [r3, #BOOT_DEVICE_OFFSET] @ spl_boot_device <- r1
/* boot mode is passed only for devices that can raw/fat mode */ /* boot mode is passed only for devices that can raw/fat mode */
cmp r2, #2 cmp r2, #BOOT_DEVICE_XIP
blt 2f blt 2f
cmp r2, #7 cmp r2, #BOOT_DEVICE_MMC2
bgt 2f bgt 2f
/* Store the boot mode (raw/FAT) in omap_bootmode */ /* Store the boot mode (raw/FAT) in omap_bootmode */
ldr r2, [r0, #DEV_DESC_PTR_OFFSET] @ get the device descriptor ptr ldr r2, [r0, #DEV_DESC_PTR_OFFSET] @ get the device descriptor ptr

1
arch/arm/include/asm/arch-am33xx/spl.h
View File

@ -23,6 +23,7 @@
#ifndef _ASM_ARCH_SPL_H_ #ifndef _ASM_ARCH_SPL_H_
#define _ASM_SPL_H_ #define _ASM_SPL_H_
#define BOOT_DEVICE_XIP 2
#define BOOT_DEVICE_NAND 5 #define BOOT_DEVICE_NAND 5
#define BOOT_DEVICE_MMC1 8 #define BOOT_DEVICE_MMC1 8
#define BOOT_DEVICE_MMC2 9 /* eMMC or daughter card */ #define BOOT_DEVICE_MMC2 9 /* eMMC or daughter card */