mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/1] omap3: fix debug_ll uart base
@ 2013-01-31 17:45 Jean-Christophe PLAGNIOL-VILLARD
  2013-02-01 17:55 ` Sascha Hauer
  0 siblings, 1 reply; 4+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-01-31 17:45 UTC (permalink / raw)
  To: barebox

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/arm/mach-omap/include/mach/debug_ll.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap/include/mach/debug_ll.h b/arch/arm/mach-omap/include/mach/debug_ll.h
index 142f01a..ed1777b 100644
--- a/arch/arm/mach-omap/include/mach/debug_ll.h
+++ b/arch/arm/mach-omap/include/mach/debug_ll.h
@@ -23,9 +23,9 @@
 #include <mach/omap3-silicon.h>
 
 #ifdef CONFIG_OMAP3EVM_UART1
-#define UART_BASE	OMAP_UART1_BASE
+#define UART_BASE	OMAP3_UART1_BASE
 #else
-#define UART_BASE	OMAP_UART3_BASE
+#define UART_BASE	OMAP3_UART3_BASE
 #endif
 
 #endif
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/1] omap3: fix debug_ll uart base
  2013-01-31 17:45 [PATCH 1/1] omap3: fix debug_ll uart base Jean-Christophe PLAGNIOL-VILLARD
@ 2013-02-01 17:55 ` Sascha Hauer
  2013-02-01 18:04   ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 1 reply; 4+ messages in thread
From: Sascha Hauer @ 2013-02-01 17:55 UTC (permalink / raw)
  To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox

On Thu, Jan 31, 2013 at 06:45:15PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  arch/arm/mach-omap/include/mach/debug_ll.h |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap/include/mach/debug_ll.h b/arch/arm/mach-omap/include/mach/debug_ll.h
> index 142f01a..ed1777b 100644
> --- a/arch/arm/mach-omap/include/mach/debug_ll.h
> +++ b/arch/arm/mach-omap/include/mach/debug_ll.h
> @@ -23,9 +23,9 @@
>  #include <mach/omap3-silicon.h>
>  
>  #ifdef CONFIG_OMAP3EVM_UART1
> -#define UART_BASE	OMAP_UART1_BASE
> +#define UART_BASE	OMAP3_UART1_BASE
>  #else
> -#define UART_BASE	OMAP_UART3_BASE
> +#define UART_BASE	OMAP3_UART3_BASE
>  #endif

This file is also used for omap4 and am33xx. Probably this used to work
when all shared the same defines. So, the above does not seem to be a
proper fix.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/1] omap3: fix debug_ll uart base
  2013-02-01 17:55 ` Sascha Hauer
@ 2013-02-01 18:04   ` Jean-Christophe PLAGNIOL-VILLARD
  2013-02-02  7:49     ` Sascha Hauer
  0 siblings, 1 reply; 4+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-02-01 18:04 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

On 18:55 Fri 01 Feb     , Sascha Hauer wrote:
> On Thu, Jan 31, 2013 at 06:45:15PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > ---
> >  arch/arm/mach-omap/include/mach/debug_ll.h |    4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/arm/mach-omap/include/mach/debug_ll.h b/arch/arm/mach-omap/include/mach/debug_ll.h
> > index 142f01a..ed1777b 100644
> > --- a/arch/arm/mach-omap/include/mach/debug_ll.h
> > +++ b/arch/arm/mach-omap/include/mach/debug_ll.h
> > @@ -23,9 +23,9 @@
> >  #include <mach/omap3-silicon.h>
> >  
> >  #ifdef CONFIG_OMAP3EVM_UART1
> > -#define UART_BASE	OMAP_UART1_BASE
> > +#define UART_BASE	OMAP3_UART1_BASE
> >  #else
> > -#define UART_BASE	OMAP_UART3_BASE
> > +#define UART_BASE	OMAP3_UART3_BASE
> >  #endif
> 
> This file is also used for omap4 and am33xx. Probably this used to work
> when all shared the same defines. So, the above does not seem to be a
> proper fix.
it is as this is under as before

you have
#ifdef CONFIG_ARCH_OMAP3
#include <mach/omap3-silicon.h>

...

#endif
> 
> Sascha
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/1] omap3: fix debug_ll uart base
  2013-02-01 18:04   ` Jean-Christophe PLAGNIOL-VILLARD
@ 2013-02-02  7:49     ` Sascha Hauer
  0 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2013-02-02  7:49 UTC (permalink / raw)
  To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox

On Fri, Feb 01, 2013 at 07:04:03PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 18:55 Fri 01 Feb     , Sascha Hauer wrote:
> > On Thu, Jan 31, 2013 at 06:45:15PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > > ---
> > >  arch/arm/mach-omap/include/mach/debug_ll.h |    4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/arch/arm/mach-omap/include/mach/debug_ll.h b/arch/arm/mach-omap/include/mach/debug_ll.h
> > > index 142f01a..ed1777b 100644
> > > --- a/arch/arm/mach-omap/include/mach/debug_ll.h
> > > +++ b/arch/arm/mach-omap/include/mach/debug_ll.h
> > > @@ -23,9 +23,9 @@
> > >  #include <mach/omap3-silicon.h>
> > >  
> > >  #ifdef CONFIG_OMAP3EVM_UART1
> > > -#define UART_BASE	OMAP_UART1_BASE
> > > +#define UART_BASE	OMAP3_UART1_BASE
> > >  #else
> > > -#define UART_BASE	OMAP_UART3_BASE
> > > +#define UART_BASE	OMAP3_UART3_BASE
> > >  #endif
> > 
> > This file is also used for omap4 and am33xx. Probably this used to work
> > when all shared the same defines. So, the above does not seem to be a
> > proper fix.
> it is as this is under as before
> 
> you have
> #ifdef CONFIG_ARCH_OMAP3
> #include <mach/omap3-silicon.h>

Ah, missed that. Applied.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-02-02  7:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-31 17:45 [PATCH 1/1] omap3: fix debug_ll uart base Jean-Christophe PLAGNIOL-VILLARD
2013-02-01 17:55 ` Sascha Hauer
2013-02-01 18:04   ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-02  7:49     ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox