diff options
| author | Tom Rini <trini@ti.com> | 2012-08-14 09:19:44 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-27 09:48:39 -0700 |
| commit | 37189a19589794f8482a1c64dcebca2d6fbe96a5 (patch) | |
| tree | 00510f3b4fe870a567850ef9d94559e5641a91d7 | |
| parent | 8e1b836ec54846bedd0cabefc1cf6fbb1e3ae2e3 (diff) | |
| download | olio-uboot-2014.01-37189a19589794f8482a1c64dcebca2d6fbe96a5.tar.xz olio-uboot-2014.01-37189a19589794f8482a1c64dcebca2d6fbe96a5.zip | |
ARM: SPL: Rename omap_boot_mode to spl_boot_mode()
Signed-off-by: Tom Rini <trini@ti.com>
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/boot-common.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl_mmc.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl_nand.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap3/board.c | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/omap_common.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 102a38190..53568acf3 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -42,7 +42,7 @@ u32 spl_boot_device(void) return (u32) (boot_params.omap_bootdevice); } -u32 omap_boot_mode(void) +u32 spl_boot_mode(void) { return omap_bootmode; } diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c index 3ad382bbc..62b308b3b 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c +++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c @@ -138,7 +138,7 @@ void spl_mmc_load_image(void) printf("spl: mmc init failed: err - %d\n", err); hang(); } - boot_mode = omap_boot_mode(); + boot_mode = spl_boot_mode(); if (boot_mode == MMCSD_MODE_RAW) { debug("boot mode - RAW\n"); mmc_load_image_raw(mmc); diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c index 8cf55c9a1..ea7cc8a9d 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_nand.c +++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c @@ -35,7 +35,7 @@ void spl_nand_load_image(void) int *src __attribute__((unused)); int *dst __attribute__((unused)); - switch (omap_boot_mode()) { + switch (spl_boot_mode()) { case NAND_MODE_HW_ECC: debug("spl: nand - using hw ecc\n"); gpmc_init(); diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index b4f4feede..164069662 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -69,7 +69,7 @@ const struct gpio_bank *const omap_gpio_bank = gpio_bank_34xx; u32 omap3_boot_device = BOOT_DEVICE_NAND; /* 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()) { case BOOT_DEVICE_MMC2: diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index 336ac393a..f5b9dfe55 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -90,7 +90,7 @@ extern struct spl_image_info spl_image; extern u32* boot_params_ptr; u32 spl_boot_device(void); -u32 omap_boot_mode(void); +u32 spl_boot_mode(void); /* SPL common function s*/ void spl_parse_image_header(const struct image_header *header); |