| Message ID | 1437052221-11040-1-git-send-email-contact@paulk.fr |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Thu, Jul 16, 2015 at 03:10:20PM +0200, Paul Kocialkowski wrote: > 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>
Le jeudi 16 juillet 2015 à 09:21 -0400, Tom Rini a écrit : > On Thu, Jul 16, 2015 at 03:10:20PM +0200, Paul Kocialkowski wrote: > > > 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> What about merging this patch? It's been more than a week since we last discussed it. Thanks!
On Thu, Jul 16, 2015 at 03:10:20PM +0200, Paul Kocialkowski wrote: > 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> Applied to u-boot/master, thanks!
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
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> --- arch/arm/cpu/armv7/omap3/sys_info.c | 2 ++ 1 file changed, 2 insertions(+)