* Tony Lindgren <[email protected]> [100122 13:07]: > * Russell King - ARM Linux <[email protected]> [100122 12:54]: > > On Fri, Jan 22, 2010 at 12:39:53PM -0800, Tony Lindgren wrote: > > > Here's this patch updated. It should now be actually more optimized for > > > non-multi-omap configurations as it uses the get_irqnr_preamble :) > > > > And the patch looks a lot cleaner and easier to read. > > > > > diff --git a/arch/arm/mach-omap2/include/mach/entry-macro.S > > > b/arch/arm/mach-omap2/include/mach/entry-macro.S > > > index c7f1720..c5ea026 100644 > > > --- a/arch/arm/mach-omap2/include/mach/entry-macro.S > > > +++ b/arch/arm/mach-omap2/include/mach/entry-macro.S > > > @@ -17,47 +17,85 @@ > > > > > > #include <plat/omap24xx.h> > > > #include <plat/omap34xx.h> > > > - > > > -/* REVISIT: This should be set dynamically if CONFIG_MULTI_OMAP2 is > > > selected */ > > > -#if defined(CONFIG_ARCH_OMAP2420) || defined(CONFIG_ARCH_OMAP2430) > > > -#define OMAP2_VA_IC_BASE OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE) > > > -#elif defined(CONFIG_ARCH_OMAP34XX) > > > -#define OMAP2_VA_IC_BASE OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE) > > > -#endif > > > -#if defined(CONFIG_ARCH_OMAP4) > > > #include <plat/omap44xx.h> > > > -#endif > > > -#define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt > > > offset */ > > > -#define ACTIVEIRQ_MASK 0x7f /* Active interrupt > > > bits */ > > > > > > .macro disable_fiq > > > .endm > > > > > > - .macro get_irqnr_preamble, base, tmp > > > - .endm > > > - > > > .macro arch_ret_to_user, tmp1, tmp2 > > > .endm > > > > > > -#ifndef CONFIG_ARCH_OMAP4 > > > +#if defined(CONFIG_ARCH_OMAP2420) || defined(CONFIG_ARCH_OMAP2430) || \ > > > + defined(CONFIG_ARCH_OMAP34XX) > > > > Isn't this equivalent to: > > > > #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) > > > > ? > > Hmm, I guess it's not like that yet, but will be hopefully > soon. > > Currently I believe we have CONFIG_ARCH_OMAP2 selected > for CONFIG_ARCH_OMAP3 too..
Hmm, never mind, I guess that issue is sorted out already. So will update the patch accordingly. Other confusing Kconfig options still remain, see below. > I have a set of patches that will remove the overlapping > Kconfig options. Basically I'm planning to convert: > > CONFIG_ARCH_OMAP1 = arch/arm/mach-omap1 > CONFIG_ARCH_OMAP2PLUS = arch/arm/mach-omap2 > CONFIG_ARCH_OMAP2 = defined(CONFIG_CPU_OMAP2420) || > defined(CONFIG_CPU_OMAP2430) > CONFIG_ARCH_OMAP3 = defined(CONFIG_CPU_OMAP3430) || > defined(CONFIG_CPU_OMAP3630) > CONFIG_ARCH_OMAP4 = stays the same > > That will get rid of the double meaning for current > CONFIG_ARCH_OMAP2, and get rid of CONFIG_ARCH_OMAP24XX > and CONFIG_ARCH_OMAP34XX. Will post after I've updated > those patches again, hopefully during next week. > > Regards, > > Tony > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
