diff options
| author | Tom Rini <trini@ti.com> | 2011-10-04 04:59:23 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-10-27 21:56:35 +0200 |
| commit | cc3f7058435c94acaaf9111340437a0a4c018de6 (patch) | |
| tree | e2d306decaee5395b0a8e94e4d90480b4e5126b6 | |
| parent | 3c6e50d7581e12b14da34b4ae646024a11cb580b (diff) | |
OMAP3 SPL: Provide weak omap_rev_string
We add an weak version of omap_rev_string in omap-common/spl.c
and while at it drop the omap3 version. Move the prototype over
to <asm/omap_common.h> with the other SPL functions.
Signed-off-by: Tom Rini <trini@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl.c | 8 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap3/board.c | 6 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap3/sys_proto.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/sys_proto.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/omap_common.h | 1 |
5 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c index 01fd58a354..d0866c03d0 100644 --- a/arch/arm/cpu/armv7/omap-common/spl.c +++ b/arch/arm/cpu/armv7/omap-common/spl.c @@ -160,3 +160,11 @@ void preloader_console_init(void) omap_rev_string(rev_string_buffer); printf("Texas Instruments %s\n", rev_string_buffer); } + +void __omap_rev_string(char *str) +{ + sprintf(str, "Revision detection unimplemented"); +} + +void omap_rev_string(char *str) + __attribute__((weak, alias("__omap_rev_string"))); diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index 1b3ef69a99..a9fdb4f8ed 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -450,9 +450,3 @@ void enable_caches(void) dcache_enable(); } #endif - -void omap_rev_string(char *omap_rev_string) -{ - sprintf(omap_rev_string, "OMAP3, sorry revision detection" \ - " unimplemented"); -} diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h index 7b60051344..995e7cb57e 100644 --- a/arch/arm/include/asm/arch-omap3/sys_proto.h +++ b/arch/arm/include/asm/arch-omap3/sys_proto.h @@ -71,5 +71,4 @@ void power_init_r(void); void dieid_num_r(void); void do_omap3_emu_romcode_call(u32 service_id, u32 parameters); void omap3_gp_romcode_call(u32 service_id, u32 parameter); -void omap_rev_string(char *omap_rev_string); #endif diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h index a81f8e5c24..1aacbb12e3 100644 --- a/arch/arm/include/asm/arch-omap4/sys_proto.h +++ b/arch/arm/include/asm/arch-omap4/sys_proto.h @@ -43,7 +43,6 @@ void sr32(void *, u32, u32, u32); u32 wait_on_value(u32, u32, void *, u32); void sdelay(unsigned long); void set_pl310_ctrl_reg(u32 val); -void omap_rev_string(char *omap4_rev_string); void setup_clocks_for_console(void); void prcm_init(void); void bypass_dpll(u32 *const base); diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index 66d6b71c1a..3f2f004afb 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -77,6 +77,7 @@ u32 omap_boot_mode(void); /* SPL common function s*/ void spl_parse_image_header(const struct image_header *header); +void omap_rev_string(char *omap_rev_string); /* NAND SPL functions */ void spl_nand_load_image(void); |