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

ARM: SPL: Rename omap_boot_mode to spl_boot_mode() 

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini 2012-08-14 09:19:44 -07:00
parent 8e1b836ec5
commit 37189a1958
5 changed files with 5 additions and 5 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

@ -42,7 +42,7 @@ u32 spl_boot_device(void)
return (u32) (boot_params.omap_bootdevice); return (u32) (boot_params.omap_bootdevice);
} }
u32 omap_boot_mode(void) u32 spl_boot_mode(void)
{ {
return omap_bootmode; return omap_bootmode;
} }

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

@ -138,7 +138,7 @@ void spl_mmc_load_image(void)
printf("spl: mmc init failed: err - %d\n", err); printf("spl: mmc init failed: err - %d\n", err);
hang(); hang();
} }
boot_mode = omap_boot_mode(); boot_mode = spl_boot_mode();
if (boot_mode == MMCSD_MODE_RAW) { if (boot_mode == MMCSD_MODE_RAW) {
debug("boot mode - RAW\n"); debug("boot mode - RAW\n");
mmc_load_image_raw(mmc); mmc_load_image_raw(mmc);

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

@ -35,7 +35,7 @@ void spl_nand_load_image(void)
int *src __attribute__((unused)); int *src __attribute__((unused));
int *dst __attribute__((unused)); int *dst __attribute__((unused));
switch (omap_boot_mode()) { switch (spl_boot_mode()) {
case NAND_MODE_HW_ECC: case NAND_MODE_HW_ECC:
debug("spl: nand - using hw ecc\n"); debug("spl: nand - using hw ecc\n");
gpmc_init(); gpmc_init();

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

@ -69,7 +69,7 @@ const struct gpio_bank *const omap_gpio_bank = gpio_bank_34xx;
u32 omap3_boot_device = BOOT_DEVICE_NAND; u32 omap3_boot_device = BOOT_DEVICE_NAND;
/* auto boot mode detection is not possible for OMAP3 - hard code */ /* auto boot mode detection is not possible for OMAP3 - hard code */
u32 omap_boot_mode(void) u32 spl_boot_mode(void)
{ {
switch (spl_boot_device()) { switch (spl_boot_device()) {
case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2:

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

@ -90,7 +90,7 @@ extern struct spl_image_info spl_image;
extern u32* boot_params_ptr; extern u32* boot_params_ptr;
u32 spl_boot_device(void); u32 spl_boot_device(void);
u32 omap_boot_mode(void); u32 spl_boot_mode(void);
/* SPL common function s*/ /* SPL common function s*/
void spl_parse_image_header(const struct image_header *header); void spl_parse_image_header(const struct image_header *header);