summaryrefslogtreecommitdiff
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2015-07-16 15:10:20 +0200
committerTom Rini <trini@konsulko.com>2015-07-27 15:02:10 -0400
commitfb9006c3a5b5af11b2926ce8f245d7c7ad14807b (patch)
treefea020e42d8364e05558f46931ee050a13cadc71 /arch/arm/cpu
parentd1a04b32f4c8f470ba836d3c25f47073785166cd (diff)
downloadu-boot-imx-fb9006c3a5b5af11b2926ce8f245d7c7ad14807b.zip
u-boot-imx-fb9006c3a5b5af11b2926ce8f245d7c7ad14807b.tar.gz
u-boot-imx-fb9006c3a5b5af11b2926ce8f245d7c7ad14807b.tar.bz2
omap3: CONFIG_REVISION_TAG ifdef check for get_board_rev
Despite being defined with __weak, this declaration of get_board_rev will conflict with the fallback one when ONFIG_REVISION_TAG is not defined. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/armv7/omap3/sys_info.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap3/sys_info.c b/arch/arm/cpu/armv7/omap3/sys_info.c
index bbb65bb..ab60a03 100644
--- a/arch/arm/cpu/armv7/omap3/sys_info.c
+++ b/arch/arm/cpu/armv7/omap3/sys_info.c
@@ -196,10 +196,12 @@ u32 get_gpmc0_width(void)
* get_board_rev() - setup to pass kernel board revision information
* returns:(bit[0-3] sub version, higher bit[7-4] is higher version)
*************************************************************************/
+#ifdef CONFIG_REVISION_TAG
u32 __weak get_board_rev(void)
{
return 0x20;
}
+#endif
/********************************************************
* get_base(); get upper addr of current execution