On Tue, Dec 06, 2011 at 03:43:48PM +0000, Pawel Moll wrote: [...]
> +/include/ "vexpress-v2m.dtsi" > diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig > index 56a61fb..c1cd08d 100644 > --- a/arch/arm/mach-vexpress/Kconfig > +++ b/arch/arm/mach-vexpress/Kconfig > @@ -1,13 +1,23 @@ > menu "Versatile Express platform type" > depends on ARCH_VEXPRESS > > -config ARCH_VEXPRESS_CA9X4 > - bool "Versatile Express Cortex-A9x4 tile" > - select CPU_V7 > - select ARM_GIC > +config ARCH_VEXPRESS_CORTEX_A5_A9 > + bool > select ARM_ERRATA_720789 > select ARM_ERRATA_751472 > - select ARM_ERRATA_753970 > + select ARM_GIC > + select CPU_V7 > + select HAVE_L2X0_L2CC > + select PL310_ERRATA_753970 if CACHE_PL310 > + help > + Provides common dependencies for Versatile Express platforms > + based on Cortex-A5 and Cortex-A9 processors. In order to > + build a working kernel, you must also enable relevant core > + tile support or Flattened Device Tree based support options. > + > +config ARCH_VEXPRESS_CA9X4 > + bool "Versatile Express Cortex-A9x4 tile" > + select ARCH_VEXPRESS_CORTEX_A5_A9 > > config ARCH_VEXPRESS_DT > bool "Device Tree support for Versatile Express platforms" > @@ -21,4 +31,23 @@ config ARCH_VEXPRESS_DT > If your bootloader supports Flattened Device Tree based booting, > say Y here. > > +config ARCH_VEXPRESS_DT_CORTEX_A5_A9 > + bool "Support for tiles based on Cortex-A5 and Cortex-A9 processors" > + depends on ARCH_VEXPRESS_DT > + select ARCH_VEXPRESS_CORTEX_A5_A9 > + help > + This option enables support for systems using Cortex-A5 and Cortex-A9 > + ARM core and logic (FPGA) tiles on the Versatile Express motherboard, > + for example: > + > + - CoreTile Express A5x2 (V2P-CA5s) > + - CoreTile Express A9x4 (V2P-CA9) > + - LogicTile Express 13MG (V2F-2XV6) with A5 SMM (Soft Macrocell Model) > + - LogicTile Express 13MG (V2F-2XV6) with A9 SMM (Soft Macrocell Model) > + - VE Cortex-A9 RTSM (Model) > + > + You must boot using a Flattened Device Tree in order to use these > + platforms. The traditional (ATAGs) boot method is not usable on > + these boards with this option. > + Because of the way these options are renamed and the backwards dependency of CONFIG_SMP in arch/arm/Kconfig, it now seems to be impossible to build an SMP kernel with this series. I will propose a patch similar to HAVE_L2X0_L2CC to see if this dependency can be factorised, but in the meantime, I suggest to fix the dependencies in arch/arm/Kconfig. Cheers ---Dave _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
