From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 06/19] ARM: SPL: Rename omap_boot_mode to spl_boot_mode()
Date: Wed, 22 Aug 2012 16:19:32 -0700 [thread overview]
Message-ID: <1345677585-15696-7-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1345677585-15696-1-git-send-email-trini@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/boot-common.c | 2 +-
arch/arm/cpu/armv7/omap-common/spl_mmc.c | 2 +-
arch/arm/cpu/armv7/omap-common/spl_nand.c | 2 +-
arch/arm/cpu/armv7/omap3/board.c | 2 +-
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 102a381..53568ac 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 3ad382b..62b308b 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 8cf55c9..ea7cc8a 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 b4f4fee..1640696 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 a3853ce..9ac0cc2 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);
--
1.7.9.5
next prev parent reply other threads:[~2012-08-22 23:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 01/19] Makefile: Move SPL files to clobber, remove from clean Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 02/19] spl_mmc: Make FAT checks / calls guarded with CONFIG_SPL_FAT_SUPPORT Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 03/19] omap-common: SPL: Add CONFIG_SPL_DISPLAY_PRINT / spl_display_print() Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 04/19] omap-common: Fix typo in save_boot_params() in lowlevel_init.S Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 05/19] ARM: SPL: Rename omap_boot_device to spl_boot_device Tom Rini
2012-08-22 23:19 ` Tom Rini [this message]
2012-08-22 23:19 ` [U-Boot] [PATCH v3 07/19] ARM: SPL: Remove NAND_MODE_HW_ECC from spl_nand.c Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 08/19] ARM: SPL: Only call mem_malloc_init if configured Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 09/19] ARM: SPL: Add <asm/spl.h> and <asm/arch/spl.h> Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 10/19] ARM: SPL: Make spl_mmc.c more generic Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 11/19] ARM: SPL: Clean up spl.c / spl_nand.c slightly Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 12/19] ARM: SPL: Start hooking in the current SPI SPL support Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 13/19] ARM: SPL: Move gpmc_init() to spl_board_init() Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 14/19] SPL: Move the omap SPL framework to common/spl Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 15/19] spl: Make CONFIG_SPL_FRAMEWORK board_init_f __weak Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 16/19] ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK Tom Rini
2012-08-23 13:14 ` Christian Riesch
2012-08-23 14:07 ` Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 17/19] da850: Add README.da850 Tom Rini
2012-08-23 12:52 ` Christian Riesch
2012-08-23 16:17 ` Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 18/19] SPL: Enhance drivers/mtd/nand/nand_spl_load.c Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 19/19] SPL: Enhance spi_spl_load to match the other load functions Tom Rini
2012-08-23 5:18 ` [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Prabhakar Lad
2012-08-23 11:22 ` Stefan Roese
2012-08-23 12:22 ` Stefano Babic
2012-08-23 12:33 ` Christian Riesch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345677585-15696-7-git-send-email-trini@ti.com \
--to=trini@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox