[PATCH] ARM: OMAP2+: cpu: Make cpu_class_is_omap2 true for all non-omap1 platforms

[Hiremath, Vaibhav]

On Wed, Jun 27, 2012 at 21:47:45, Tony Lindgren wrote:
> * Tony Lindgren <tony at atomide.com> [120627 06:44]:
> > * Hiremath, Vaibhav <hvaibhav at ti.com> [120614 07:37]:
> > > On Mon, Jun 11, 2012 at 18:52:54, Hiremath, Vaibhav wrote:
> > > > As omap1 and omap2 will never be compiled together, due to
> > > > different compiler flags, so we can simply make
> > > > cpu_class_is_omap2() = true, for all non-omap1 platforms.
> > > > 
> > > > Signed-off-by: Vaibhav Hiremath <hvaibhav at ti.com>
> > > > ---
> > > >  arch/arm/plat-omap/include/plat/cpu.h |    3 +--
> > > >  1 files changed, 1 insertions(+), 2 deletions(-)
> > > > 
> > > 
> > > Tony,
> > > 
> > > Ping???
> > 
> > Thanks applying into devel-am33xx branch.
> 
> Actually looks like this fails for the dynamic detection
> case with omap1_defconfig.. Looks like you did not build
> test your patch with omap1_defconfig? Please do it for
> every patch!
> 
> It seems we need something better though for multi zImage
> too, we can't really rely on CONFIG_ARCH_OMAP1 or
> CONFIG_ARCH_OMAP2PLUS here to determine anything.
> 
> Anyways, dropping this for now, let's try to come up
> with something better.
> 

Yes Tony, you are right I did not test omap1 for this patch. My bad...

How about something like, considering the fact that, omap_type() is the 
culprit here and is not applicable to omap1 at all. In case of omap1, we 
don't use omap_type() function.


diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 6a42558..5900a3d 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -42,7 +42,14 @@
 #define OMAP2_DEVICE_TYPE_GP           3
 #define OMAP2_DEVICE_TYPE_BAD          4

+#ifdef CONFIG_ARCH_OMAP2PLUS
 int omap_type(void);
+#else
+inline static int omap_type(void)
+{
+	/* Always return GP, since it is not being used anyway for omap1 */
+	return OMAP2_DEVICE_TYPE_GP;
+}
+#endif

 /*
  * omap_rev bits:


Thanks,
Vaibhav