]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
omap3: CONFIG_REVISION_TAG ifdef check for get_board_rev
authorPaul Kocialkowski <contact@paulk.fr>
Thu, 16 Jul 2015 13:10:20 +0000 (15:10 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 9 Sep 2015 11:50:44 +0000 (13:50 +0200)
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>
arch/arm/cpu/armv7/omap3/sys_info.c

index bbb65bbe7263674c2b47b97ee05a9f588ed1c58f..ab60a0341525a9ed2d0a1f9c8d7886ae5e45d02e 100644 (file)
@@ -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