V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ARM: SPL: Rename omap_boot_device to spl_boot_device 

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini 2012-08-13 12:53:23 -07:00
parent 9f8a6e7ae7
commit 8e1b836ec5
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/omap-common/boot-common.c
View File

@ -37,7 +37,7 @@ struct omap_boot_parameters boot_params __attribute__ ((section(".data")));
*/
u32 omap_bootmode = MMCSD_MODE_FAT;
u32 omap_boot_device(void)
u32 spl_boot_device(void)
{
return (u32) (boot_params.omap_bootdevice);
}

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

@ -52,11 +52,11 @@ ENTRY(save_boot_params)
ldr r1, =boot_params
str r0, [r1]
#ifdef CONFIG_SPL_BUILD
/* Store the boot device in omap_boot_device */
/* Store the boot device in spl_boot_device */
ldrb r2, [r0, #BOOT_DEVICE_OFFSET] @ r1 <- value of boot device
and r2, #BOOT_DEVICE_MASK
ldr r3, =boot_params
strb r2, [r3, #BOOT_DEVICE_OFFSET] @ omap_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 */
cmp r2, #2

2
arch/arm/cpu/armv7/omap-common/spl.c
View File

@ -156,7 +156,7 @@ void board_init_r(gd_t *id, ulong dummy)
spl_board_init();
#endif
boot_device = omap_boot_device();
boot_device = spl_boot_device();
debug("boot device - %d\n", boot_device);
switch (boot_device) {
#ifdef CONFIG_SPL_MMC_SUPPORT

2
arch/arm/cpu/armv7/omap-common/spl_mmc.c
View File

@ -37,7 +37,7 @@ DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis)
{
switch (omap_boot_device()) {
switch (spl_boot_device()) {
case BOOT_DEVICE_MMC1:
omap_mmc_init(0, 0, 0);
break;

4
arch/arm/cpu/armv7/omap3/board.c
View File

@ -71,7 +71,7 @@ u32 omap3_boot_device = BOOT_DEVICE_NAND;
/* auto boot mode detection is not possible for OMAP3 - hard code */
u32 omap_boot_mode(void)
{
switch (omap_boot_device()) {
switch (spl_boot_device()) {
case BOOT_DEVICE_MMC2:
return MMCSD_MODE_RAW;
case BOOT_DEVICE_MMC1:
@ -86,7 +86,7 @@ u32 omap_boot_mode(void)
}
}
u32 omap_boot_device(void)
u32 spl_boot_device(void)
{
return omap3_boot_device;
}

2
arch/arm/include/asm/omap_common.h
View File

@ -89,7 +89,7 @@ struct spl_image_info {
extern struct spl_image_info spl_image;
extern u32* boot_params_ptr;
u32 omap_boot_device(void);
u32 spl_boot_device(void);
u32 omap_boot_mode(void);
/* SPL common function s*/