leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OMAP3 SPL: Provide weak omap_rev_string

Browse Source 
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>
This commit is contained in:
Tom Rini 2011-10-04 04:59:23 +00:00 committed by Albert ARIBAUD
parent 3c6e50d758
commit cc3f705843
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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")));

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

@ -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");
}

1
arch/arm/include/asm/arch-omap3/sys_proto.h
View File

@ -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

1
arch/arm/include/asm/arch-omap4/sys_proto.h
View File

@ -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);

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

@ -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);