Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Tony Lindgren <tony@atomide.com>]

[-- Attachment #1: Type: text/plain, Size: 1045 bytes --]

* Tony Lindgren <tony@atomide.com> [071031 08:22]:
> * Paul Walmsley <paul@pwsan.com> [071025 09:01]:
> 
> > Hello Dirk,
> >
> > On Thu, 25 Oct 2007, Dirk Behme wrote:
> >
> >> Mmh, I like to fix it in include/asm-arm/arch-omap/omap24xx.h, so I prefer 
> >> [1].
> >>
> >> With [1] we
> >>
> >> - fix it where it was introduced
> >> - have an additional #ifdef only in a header file instead of 
> >> plat-omap/devices.c, which is IMHO better
> >> - fix it for everybody now and in the future who directly or indirectly 
> >> includes omap24xx.h.
> >
> > Hopefully this is just a workaround until we can get rid of these 
> > conditional defines for multiboot kernels.  Generally speaking, would you 
> > propose doing the same thing for the other conditional defines in 
> > include/asm-arm/arch-omap/omap24xx.h, such as OMAP2_32KSYNCT_BASE, 
> > OMAP2_SDRC_BASE, etc.?
> 
> Sounds like the real fix is to set these addresses in the init code
> somewhere based on the omap type.

I'll push a temporary fix based on Luis' patch, see below.

Tony

[-- Attachment #2: omap2-ctrl-base-fix.patch --]
[-- Type: text/x-diff, Size: 324 bytes --]

--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -101,6 +101,9 @@
 #define OMAP2_VA_IC_BASE	IO_ADDRESS(OMAP24XX_IC_BASE)
 #define OMAP2_CTRL_BASE		OMAP243X_CTRL_BASE
 
+#else
+/* FIXME: These will go away soon */
+#define OMAP2_CTRL_BASE		L4_24XX_BASE
 #endif
 
 /* Control module */

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]