[U-Boot] [PATCH 1/2] omap3: CONFIG_REVISION_TAG ifdef check for get_board_rev

[U-Boot] [PATCH 1/2] omap3: CONFIG_REVISION_TAG ifdef check for get_board_rev

[Paul Kocialkowski]

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(+)

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

[U-Boot] [PATCH 2/2] am33xx: CONFIG_REVISION_TAG ifdef check for get_board_rev

[Paul Kocialkowski]

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/am33xx/sys_info.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/cpu/armv7/am33xx/sys_info.c b/arch/arm/cpu/armv7/am33xx/sys_info.c
index 781d83f..9d5a5d3 100644
--- a/arch/arm/cpu/armv7/am33xx/sys_info.c
+++ b/arch/arm/cpu/armv7/am33xx/sys_info.c
@@ -54,10 +54,12 @@ u32 get_cpu_type(void)
  * get_board_rev() - setup to pass kernel board revision information
  * returns: 0 for the ATAG REVISION tag value.
  */
+#ifdef CONFIG_REVISION_TAG
 u32 __weak get_board_rev(void)
 {
 	return 0;
 }
+#endif
 
 /**
  * get_device_type(): tell if GP/HS/EMU/TST
-- 
1.9.1

[U-Boot] [PATCH 2/2] am33xx: CONFIG_REVISION_TAG ifdef check for get_board_rev

[Tom Rini]

On Thu, Jul 16, 2015 at 03:10:21PM +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>

There is no support for am33xx boards and Linux-kernel board-file kernels
so lets just drop this weak default one and let boards that must have
this for various reasons implement a real one.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150716/ba245056/attachment.sig>

[U-Boot] [PATCH 1/2] omap3: CONFIG_REVISION_TAG ifdef check for get_board_rev

[Tom Rini]

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>

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150716/1e8bf5e5/attachment.sig>

[U-Boot] [PATCH 2/2] am33xx: CONFIG_REVISION_TAG ifdef check for get_board_rev

[Paul Kocialkowski]

Le jeudi 16 juillet 2015 ? 09:20 -0400, Tom Rini a ?crit :
> On Thu, Jul 16, 2015 at 03:10:21PM +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>
> 
> There is no support for am33xx boards and Linux-kernel board-file kernels
> so lets just drop this weak default one and let boards that must have
> this for various reasons implement a real one.

That's right, we can actually simply remove the whole function. If
that's okay, I'll just send another patch that replaces 2/2 and 1/2
should still be good for merging without another iteration.

Thanks for the review!

-- 
Paul Kocialkowski, Replicant developer

Replicant is a fully free Android distribution running on several
devices, a free software mobile operating system putting the emphasis on
freedom and privacy/security.

Website: http://www.replicant.us/
Blog: http://blog.replicant.us/
Wiki/tracker/forums: http://redmine.replicant.us/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150716/27270b78/attachment.sig>

[U-Boot] [PATCH 1/2] omap3: CONFIG_REVISION_TAG ifdef check for get_board_rev

[Paul Kocialkowski]

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!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150726/05fb9db3/attachment.sig>

[U-Boot] [U-Boot, 1/2] omap3: CONFIG_REVISION_TAG ifdef check for get_board_rev

[Tom Rini]

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!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/90456e20/attachment.sig>