On Thu, 30 Sep 2010, Shilimkar, Santosh wrote: > > -----Original Message----- > > From: Tony Lindgren [mailto:tony@xxxxxxxxxxx] > > Sent: Thursday, September 30, 2010 8:00 AM > > To: Shilimkar, Santosh > > Cc: linux-omap@xxxxxxxxxxxxxxx; Varadarajan, Charulatha; Nayak, Rajendra; > > Raja, Govindraj; Kevin Hilman > > Subject: Re: [GIT PULL] for testing: OMAP hwmod driver conversions: > > watchdog, UART, i2c > > > > * Tony Lindgren <tony@xxxxxxxxxxx> [100929 19:10]: > > > > > > Then trying to build for omap1 OSK fails with: > > > > > > In file included from arch/arm/plat-omap/common.c:35: > > > arch/arm/plat-omap/include/plat/control.h:20:40: error: > > mach/ctrl_module_core_44xx.h: No such file or directory > > > arch/arm/plat-omap/include/plat/control.h:21:40: error: > > mach/ctrl_module_wkup_44xx.h: No such file or directory > > > arch/arm/plat-omap/include/plat/control.h:22:44: error: > > mach/ctrl_module_pad_core_44xx.h: No such file or directory > > > arch/arm/plat-omap/include/plat/control.h:23:44: error: > > mach/ctrl_module_pad_wkup_44xx.h: No such file or directory > > > > This seems to be related to Santosh' commit 802edcb7. > > > :( > > > Santosh, can you do a patch to fix this against the current > > omap-for-linus branch? > > > Below is the patch(also attached)which fixes the OMAP1 build issue. > --------- > >From c06e887f402ceff03e6c28bb377bcbfe35318719 Mon Sep 17 00:00:00 2001 > From: Santosh Shilimkar <santosh.shilimkar@xxxxxx> > Date: Thu, 30 Sep 2010 12:23:07 +0530 > Subject: [PATCH] omap: control: Fix the omap1 build break > > The commit 802edcb7 broke the omap1 build > > In file included from arch/arm/plat-omap/common.c:35: > arch/arm/plat-omap/include/plat/control.h:20: > fatal error: mach/ctrl_module_core_44xx.h: No such file or directory > compilation terminated. > make[1]: *** [arch/arm/plat-omap/common.o] Error 1 > make: *** [arch/arm/plat-omap] Error 2 > > Fix it by creating the headers needed for compiling under > mach-omap1/include/mach and mach-omap2/include/mach. > Also move omap4 specific headers under mach-omap2/control.h > > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx> > --- > arch/arm/mach-omap1/include/mach/control.h | 3 +++ > arch/arm/mach-omap2/include/mach/control.h | 8 ++++++++ > arch/arm/plat-omap/include/plat/control.h | 5 +---- > 3 files changed, 12 insertions(+), 4 deletions(-) > create mode 100644 arch/arm/mach-omap1/include/mach/control.h > create mode 100644 arch/arm/mach-omap2/include/mach/control.h > > diff --git a/arch/arm/mach-omap1/include/mach/control.h b/arch/arm/mach-omap1/include/mach/control.h > new file mode 100644 > index 0000000..c1fd4c0 > --- /dev/null > +++ b/arch/arm/mach-omap1/include/mach/control.h > @@ -0,0 +1,3 @@ > +/* > + * arch/arm/mach-omap1/include/mach/control.h > + */ OMAP1 doesn't have a SCM, so this is the wrong fix. A better approach is here: https://patchwork.kernel.org/patch/218992/ > diff --git a/arch/arm/mach-omap2/include/mach/control.h b/arch/arm/mach-omap2/include/mach/control.h > new file mode 100644 > index 0000000..dd41272 > --- /dev/null > +++ b/arch/arm/mach-omap2/include/mach/control.h > @@ -0,0 +1,8 @@ > +/* > + * arch/arm/mach-omap2/include/mach/control.h > + */ > +#include <mach/ctrl_module_core_44xx.h> > +#include <mach/ctrl_module_wkup_44xx.h> > +#include <mach/ctrl_module_pad_core_44xx.h> > +#include <mach/ctrl_module_pad_wkup_44xx.h> > + > diff --git a/arch/arm/plat-omap/include/plat/control.h b/arch/arm/plat-omap/include/plat/control.h > index 19c9b2a..7b047e5 100644 > --- a/arch/arm/plat-omap/include/plat/control.h > +++ b/arch/arm/plat-omap/include/plat/control.h > @@ -17,10 +17,7 @@ > #define __ASM_ARCH_CONTROL_H > > #include <mach/io.h> > -#include <mach/ctrl_module_core_44xx.h> > -#include <mach/ctrl_module_wkup_44xx.h> > -#include <mach/ctrl_module_pad_core_44xx.h> > -#include <mach/ctrl_module_pad_wkup_44xx.h> > +#include <mach/control.h> > > #ifndef __ASSEMBLY__ > #define OMAP242X_CTRL_REGADDR(reg) \ > -- > 1.6.0.4 > > > > - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
