| Message ID | 1346436765-9709-1-git-send-email-robherring2@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Friday 31 August 2012, Rob Herring wrote: > [Rob Herring]: Rebased to not be dependent on the mass mach header rename. > As a result, omap2plus, imx, mxs and ux500 are not converted. Highbank, > picoxcell, mvebu, socfpga, and vexpress are converted. > > v2: This version avoids the kconfig symbol name changes and simply moves > multi-platform enabled platform kconfig option out of the choice option > and into the platform's mach directory. A separate series fixes DEBUG_LL > for multi-platform. This looks like a nice start to play with multiplatform, and I guess it would be nice to merge it for v3.7. > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -254,27 +254,9 @@ config MMU > # > choice > prompt "ARM system type" > + depends on !ARCH_MULTIPLATFORM > default ARCH_VERSATILE Why did you move ARCH_MULTIPLATFORM out of the "choice" statement? If we leave it in there, and make it the default, then we don't even have to change the defconfigs any more (except the versatile one, which is no longer the default), which I think is quite clever and helps git-bisecting across this commit. I also still think that we should allow platforms to be part of both multi-platform and single-platform builds, for cases it helps with. For instance, we could enable one platform to be used in multiplatform kernels with the subset of its board files and device drivers that are possible, while leaving board files that cannot work with sparse-irq and drivers that rely on platform specific headers as "depends on !ARCH_MULTIPLATFORM". Arnd
On 09/03/2012 11:34 AM, Arnd Bergmann wrote: > On Friday 31 August 2012, Rob Herring wrote: >> [Rob Herring]: Rebased to not be dependent on the mass mach header rename. >> As a result, omap2plus, imx, mxs and ux500 are not converted. Highbank, >> picoxcell, mvebu, socfpga, and vexpress are converted. >> >> v2: This version avoids the kconfig symbol name changes and simply moves >> multi-platform enabled platform kconfig option out of the choice option >> and into the platform's mach directory. A separate series fixes DEBUG_LL >> for multi-platform. > > This looks like a nice start to play with multiplatform, and I guess it > would be nice to merge it for v3.7. > >> --- a/arch/arm/Kconfig >> +++ b/arch/arm/Kconfig >> @@ -254,27 +254,9 @@ config MMU >> # >> choice >> prompt "ARM system type" >> + depends on !ARCH_MULTIPLATFORM >> default ARCH_VERSATILE > > Why did you move ARCH_MULTIPLATFORM out of the "choice" statement? > If we leave it in there, and make it the default, then we don't > even have to change the defconfigs any more (except the versatile > one, which is no longer the default), which I think is quite clever > and helps git-bisecting across this commit. We don't have to change and of the defconfigs or .config in this patch. Bisecting the converted platforms is a problem I guess. It can be worked around by setting ARCH_MULTIPLATFORM before configuring. I'm not convinced fixing it is worth the complexity added to kconfig. > I also still think that we should allow platforms to be part of > both multi-platform and single-platform builds, for cases it helps > with. > > For instance, we could enable one platform to be used in > multiplatform kernels with the subset of its board files and > device drivers that are possible, while leaving board files > that cannot work with sparse-irq and drivers that rely on > platform specific headers as "depends on !ARCH_MULTIPLATFORM". Individual platforms can still do that. I just happened to convert all platforms which have no need to be in both. While you can do that, I don't think we should encourage it. I don't think we want to see platforms partially converted to common clk or sparse irq. The latter is certainly not hard to do. Rob
On Monday 03 September 2012, Rob Herring wrote: > On 09/03/2012 11:34 AM, Arnd Bergmann wrote: > >> @@ -254,27 +254,9 @@ config MMU > >> # > >> choice > >> prompt "ARM system type" > >> + depends on !ARCH_MULTIPLATFORM > >> default ARCH_VERSATILE > > > > Why did you move ARCH_MULTIPLATFORM out of the "choice" statement? > > If we leave it in there, and make it the default, then we don't > > even have to change the defconfigs any more (except the versatile > > one, which is no longer the default), which I think is quite clever > > and helps git-bisecting across this commit. > > We don't have to change and of the defconfigs or .config in this patch. How does ARCH_MULTIPLATFORM get set then when building the existing defconfig files for the converted platforms? > > For instance, we could enable one platform to be used in > > multiplatform kernels with the subset of its board files and > > device drivers that are possible, while leaving board files > > that cannot work with sparse-irq and drivers that rely on > > platform specific headers as "depends on !ARCH_MULTIPLATFORM". > > Individual platforms can still do that. I just happened to convert all > platforms which have no need to be in both. While you can do that, I > don't think we should encourage it. I don't think we want to see > platforms partially converted to common clk or sparse irq. The latter is > certainly not hard to do. I was thinking of other cases actually: * device drivers that we don't really care about much but that rely on a mach/* header file. In some cases it can be hard to clean up those headers, so as an intermediate step, we can just disable the drivers when building multiplatform. * At least the Samsung platforms have files that are built for separate platforms in a way that does not work across platforms: arch/arm/plat-samsung/devs.c depends heavily on constants defined in mach/*.h header files. When building for DT-only, we can decide to just not build this file. Arnd
On 09/04/2012 01:56 AM, Arnd Bergmann wrote: > On Monday 03 September 2012, Rob Herring wrote: >> On 09/03/2012 11:34 AM, Arnd Bergmann wrote: >>>> @@ -254,27 +254,9 @@ config MMU >>>> # >>>> choice >>>> prompt "ARM system type" >>>> + depends on !ARCH_MULTIPLATFORM >>>> default ARCH_VERSATILE >>> >>> Why did you move ARCH_MULTIPLATFORM out of the "choice" statement? >>> If we leave it in there, and make it the default, then we don't >>> even have to change the defconfigs any more (except the versatile >>> one, which is no longer the default), which I think is quite clever >>> and helps git-bisecting across this commit. >> >> We don't have to change and of the defconfigs or .config in this patch. > > How does ARCH_MULTIPLATFORM get set then when building the existing > defconfig files for the converted platforms? Ahhh, right. Those need to be updated. It doesn't really matter if ARCH_MULTIPLATFORM is in the choice or not. It matters if we move platforms out of the choice or not. More on that below. >>> For instance, we could enable one platform to be used in >>> multiplatform kernels with the subset of its board files and >>> device drivers that are possible, while leaving board files >>> that cannot work with sparse-irq and drivers that rely on >>> platform specific headers as "depends on !ARCH_MULTIPLATFORM". >> >> Individual platforms can still do that. I just happened to convert all >> platforms which have no need to be in both. While you can do that, I >> don't think we should encourage it. I don't think we want to see >> platforms partially converted to common clk or sparse irq. The latter is >> certainly not hard to do. > > I was thinking of other cases actually: > > * device drivers that we don't really care about much but that rely > on a mach/* header file. In some cases it can be hard to clean up > those headers, so as an intermediate step, we can just disable the > drivers when building multiplatform. depends on !ARCH_MULTIPLATFORM ? > * At least the Samsung platforms have files that are built for separate > platforms in a way that does not work across platforms: > arch/arm/plat-samsung/devs.c depends heavily on constants defined > in mach/*.h header files. When building for DT-only, we can decide to > just not build this file. I still think that should be possible on a per platform basis, but why mandate that all platforms do that? We have ARCH_FOO in the choice today. Assuming we want to keep the choice name as is to not break configs (as Russell wanted), we have to leave this alone. So then we create ARCH_FOO_MULTI for the mult-platform case and also ARCH_FOO_OPTIONS to avoid duplicating all the per mach selects for ARCH_FOO and ARCH_FOO_MULTI. However, then we have ARCH_FOO as a depends all over the tree. I'd like to avoid having to fix-up all those to be depends on ARCH_FOO_OPTIONS or (ARCH_FOO || ARCH_FOO_MULTI). Rob
On Tuesday 04 September 2012, Rob Herring wrote: > On 09/04/2012 01:56 AM, Arnd Bergmann wrote: > > On Monday 03 September 2012, Rob Herring wrote: > >> On 09/03/2012 11:34 AM, Arnd Bergmann wrote: > >>>> @@ -254,27 +254,9 @@ config MMU > >>>> # > >>>> choice > >>>> prompt "ARM system type" > >>>> + depends on !ARCH_MULTIPLATFORM > >>>> default ARCH_VERSATILE > >>> > >>> Why did you move ARCH_MULTIPLATFORM out of the "choice" statement? > >>> If we leave it in there, and make it the default, then we don't > >>> even have to change the defconfigs any more (except the versatile > >>> one, which is no longer the default), which I think is quite clever > >>> and helps git-bisecting across this commit. > >> > >> We don't have to change and of the defconfigs or .config in this patch. > > > > How does ARCH_MULTIPLATFORM get set then when building the existing > > defconfig files for the converted platforms? > > Ahhh, right. Those need to be updated. It doesn't really matter if > ARCH_MULTIPLATFORM is in the choice or not. It matters if we move > platforms out of the choice or not. More on that below. But if ARCH_MULTIPLATFORM is one of the choice statements rather than a separate option, you don't need to change any of the defconfigs, and you can keep using 'make oldconfig' when bisecting over this commit. > > > > I was thinking of other cases actually: > > > > * device drivers that we don't really care about much but that rely > > on a mach/* header file. In some cases it can be hard to clean up > > those headers, so as an intermediate step, we can just disable the > > drivers when building multiplatform. > > depends on !ARCH_MULTIPLATFORM ? Yes, of course, that is what you'd do in in the drivers, but it only works if the same platform can be used both with and without ARCH_MULTIPLATFORM. > > * At least the Samsung platforms have files that are built for separate > > platforms in a way that does not work across platforms: > > arch/arm/plat-samsung/devs.c depends heavily on constants defined > > in mach/*.h header files. When building for DT-only, we can decide to > > just not build this file. > > I still think that should be possible on a per platform basis, but why > mandate that all platforms do that? I wasn't suggesting we do that. The platforms that you have already converted are all ok to stay multiplatform-only. > We have ARCH_FOO in the choice today. Assuming we want to keep the > choice name as is to not break configs (as Russell wanted), we have to > leave this alone. So then we create ARCH_FOO_MULTI for the mult-platform > case and also ARCH_FOO_OPTIONS to avoid duplicating all the per mach > selects for ARCH_FOO and ARCH_FOO_MULTI. However, then we have ARCH_FOO > as a depends all over the tree. I'd like to avoid having to fix-up all > those to be depends on ARCH_FOO_OPTIONS or (ARCH_FOO || ARCH_FOO_MULTI). I've been going back and forth a few times between the different methods when I created the earlier version of this patch, trying to find the one that is least invasive. As you say, creating a new ARCH_FOO_MULTI in parallel with the existing (choice) ARCH_FOO means we have to change all the Kconfig statements that refer to ARCH_FOO. The good news is that I think we now only have to do it inside of the mach-foo directories, which we might want to rework anyway so you can more easily build e.g. a THUMB2 kernel that enables all the ARMv7 platforms but not the ARMv6 ones. All device drivers that have a dependency on a specific platform should fall into one of two categories: a) Those using platform specific header files. We just decided to not allow this in multiplatform kernels, so having a dependency on a symbol that only exists for single-platform builds is appropriate. b) Drivers that only make sense for one platform but can be built anywhere, e.g. after fixing the include path from a). I'd argue that we should allow building them anyway, to improve build coverage, so we should better remove the dependency, or turn it into a more specific one. Arnd
On 09/05/2012 05:36 AM, Arnd Bergmann wrote: > On Tuesday 04 September 2012, Rob Herring wrote: >> On 09/04/2012 01:56 AM, Arnd Bergmann wrote: >>> On Monday 03 September 2012, Rob Herring wrote: >>>> On 09/03/2012 11:34 AM, Arnd Bergmann wrote: >>>>>> @@ -254,27 +254,9 @@ config MMU >>>>>> # >>>>>> choice >>>>>> prompt "ARM system type" >>>>>> + depends on !ARCH_MULTIPLATFORM >>>>>> default ARCH_VERSATILE >>>>> >>>>> Why did you move ARCH_MULTIPLATFORM out of the "choice" statement? >>>>> If we leave it in there, and make it the default, then we don't >>>>> even have to change the defconfigs any more (except the versatile >>>>> one, which is no longer the default), which I think is quite clever >>>>> and helps git-bisecting across this commit. >>>> >>>> We don't have to change and of the defconfigs or .config in this patch. >>> >>> How does ARCH_MULTIPLATFORM get set then when building the existing >>> defconfig files for the converted platforms? >> >> Ahhh, right. Those need to be updated. It doesn't really matter if >> ARCH_MULTIPLATFORM is in the choice or not. It matters if we move >> platforms out of the choice or not. More on that below. > > But if ARCH_MULTIPLATFORM is one of the choice statements rather than > a separate option, you don't need to change any of the defconfigs, > and you can keep using 'make oldconfig' when bisecting over this > commit. >>> >>> I was thinking of other cases actually: >>> >>> * device drivers that we don't really care about much but that rely >>> on a mach/* header file. In some cases it can be hard to clean up >>> those headers, so as an intermediate step, we can just disable the >>> drivers when building multiplatform. >> >> depends on !ARCH_MULTIPLATFORM ? > > Yes, of course, that is what you'd do in in the drivers, but it only works > if the same platform can be used both with and without ARCH_MULTIPLATFORM. > >>> * At least the Samsung platforms have files that are built for separate >>> platforms in a way that does not work across platforms: >>> arch/arm/plat-samsung/devs.c depends heavily on constants defined >>> in mach/*.h header files. When building for DT-only, we can decide to >>> just not build this file. >> >> I still think that should be possible on a per platform basis, but why >> mandate that all platforms do that? > > I wasn't suggesting we do that. The platforms that you have already > converted are all ok to stay multiplatform-only. > >> We have ARCH_FOO in the choice today. Assuming we want to keep the >> choice name as is to not break configs (as Russell wanted), we have to >> leave this alone. So then we create ARCH_FOO_MULTI for the mult-platform >> case and also ARCH_FOO_OPTIONS to avoid duplicating all the per mach >> selects for ARCH_FOO and ARCH_FOO_MULTI. However, then we have ARCH_FOO >> as a depends all over the tree. I'd like to avoid having to fix-up all >> those to be depends on ARCH_FOO_OPTIONS or (ARCH_FOO || ARCH_FOO_MULTI). > > I've been going back and forth a few times between the different methods > when I created the earlier version of this patch, trying to find the one > that is least invasive. As you say, creating a new ARCH_FOO_MULTI in parallel > with the existing (choice) ARCH_FOO means we have to change all the Kconfig > statements that refer to ARCH_FOO. The good news is that I think we now only > have to do it inside of the mach-foo directories, which we might want to > rework anyway so you can more easily build e.g. a THUMB2 kernel that enables > all the ARMv7 platforms but not the ARMv6 ones. > > All device drivers that have a dependency on a specific platform should > fall into one of two categories: > > a) Those using platform specific header files. We just decided to not allow > this in multiplatform kernels, so having a dependency on a symbol that > only exists for single-platform builds is appropriate. > > b) Drivers that only make sense for one platform but can be built anywhere, > e.g. after fixing the include path from a). I'd argue that we should allow > building them anyway, to improve build coverage, so we should better remove > the dependency, or turn it into a more specific one. Agreed. There are some other cases like clk drivers which are not visible options. But changing those are probably manageable. So to summarize, I'll make ARCH_MULTIPLATFORM part of the choice. The platforms I converted will stay multi-plat only and don't need additional kconfig options. Additional platforms converted can choose whether they want to support both single and multi platform in the kconfig. Rob
On Wednesday 05 September 2012, Rob Herring wrote: > So to summarize, I'll make ARCH_MULTIPLATFORM part of the choice. The > platforms I converted will stay multi-plat only and don't need > additional kconfig options. Additional platforms converted can choose > whether they want to support both single and multi platform in the kconfig. > Ok, excellent! Arnd
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3557f12..4c9f2fc 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -254,27 +254,9 @@ config MMU # choice prompt "ARM system type" + depends on !ARCH_MULTIPLATFORM default ARCH_VERSATILE -config ARCH_SOCFPGA - bool "Altera SOCFPGA family" - select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_AMBA - select ARM_GIC - select CACHE_L2X0 - select CLKDEV_LOOKUP - select COMMON_CLK - select CPU_V7 - select DW_APB_TIMER - select DW_APB_TIMER_OF - select GENERIC_CLOCKEVENTS - select GPIO_PL061 if GPIOLIB - select HAVE_ARM_SCU - select SPARSE_IRQ - select USE_OF - help - This enables support for Altera SOCFPGA Cyclone V platform - config ARCH_INTEGRATOR bool "ARM Ltd. Integrator family" select ARM_AMBA @@ -328,24 +310,6 @@ config ARCH_VERSATILE help This enables support for ARM Ltd Versatile board. -config ARCH_VEXPRESS - bool "ARM Ltd. Versatile Express family" - select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_AMBA - select ARM_TIMER_SP804 - select CLKDEV_LOOKUP - select COMMON_CLK - select GENERIC_CLOCKEVENTS - select HAVE_CLK - select HAVE_PATA_PLATFORM - select ICST - select NO_IOPORT - select PLAT_VERSATILE - select PLAT_VERSATILE_CLCD - select REGULATOR_FIXED_VOLTAGE if REGULATOR - help - This enables support for the ARM Ltd Versatile Express boards. - config ARCH_AT91 bool "Atmel AT91" select ARCH_REQUIRE_GPIOLIB @@ -369,24 +333,6 @@ config ARCH_BCMRING help Support for Broadcom's BCMRing platform. -config ARCH_HIGHBANK - bool "Calxeda Highbank-based" - select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_AMBA - select ARM_GIC - select ARM_TIMER_SP804 - select CACHE_L2X0 - select CLKDEV_LOOKUP - select COMMON_CLK - select CPU_V7 - select GENERIC_CLOCKEVENTS - select HAVE_ARM_SCU - select HAVE_SMP - select SPARSE_IRQ - select USE_OF - help - Support for the Calxeda Highbank SoC based boards. - config ARCH_CLPS711X bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" select CPU_ARM720T @@ -567,18 +513,6 @@ config ARCH_IXP4XX help Support for Intel's IXP4XX (XScale) family of processors. -config ARCH_MVEBU - bool "Marvell SOCs with Device Tree support" - select GENERIC_CLOCKEVENTS - select MULTI_IRQ_HANDLER - select SPARSE_IRQ - select CLKSRC_MMIO - select GENERIC_IRQ_CHIP - select IRQ_DOMAIN - select COMMON_CLK - help - Support for the Marvell SoC Family with device tree support - config ARCH_DOVE bool "Marvell Dove" select CPU_V7 @@ -699,25 +633,6 @@ config ARCH_TEGRA This enables support for NVIDIA Tegra based systems (Tegra APX, Tegra 6xx and Tegra 2 series). -config ARCH_PICOXCELL - bool "Picochip picoXcell" - select ARCH_REQUIRE_GPIOLIB - select ARM_PATCH_PHYS_VIRT - select ARM_VIC - select CPU_V6K - select DW_APB_TIMER - select DW_APB_TIMER_OF - select GENERIC_CLOCKEVENTS - select GENERIC_GPIO - select HAVE_TCM - select NO_IOPORT - select SPARSE_IRQ - select USE_OF - help - This enables support for systems based on the Picochip picoXcell - family of Femtocell devices. The picoxcell support requires device tree - for all boards. - config ARCH_PNX4008 bool "Philips Nexperia PNX4008 Mobile" select CPU_ARM926T @@ -1039,6 +954,58 @@ config ARCH_ZYNQ Support for Xilinx Zynq ARM Cortex A9 Platform endchoice +menuconfig ARCH_MULTIPLATFORM + bool "Multiple platform selection" + select USE_OF + select COMMON_CLK + select SPARSE_IRQ + select MULTI_IRQ_HANDLER + select AUTO_ZRELADDR + depends on MMU + +if ARCH_MULTIPLATFORM + +comment "CPU Core family selection" + +config ARCH_MULTI_V4 + bool "ARMv4 based platforms (FA526, StrongARM)" + select ARCH_MULTI_V4_V5 + depends on !ARCH_MULTI_V6_V7 + +config ARCH_MULTI_V4T + bool "ARMv4T based platforms (ARM720T, ARM920T, ...)" + select ARCH_MULTI_V4_V5 + depends on !ARCH_MULTI_V6_V7 + +config ARCH_MULTI_V5 + bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)" + select ARCH_MULTI_V4_V5 + depends on !ARCH_MULTI_V6_V7 + +config ARCH_MULTI_V4_V5 + bool + +config ARCH_MULTI_V6 + bool "ARMv6 based platforms (ARM11, Scorpion, ...)" + select CPU_V6 + select ARCH_MULTI_V6_V7 + +config ARCH_MULTI_V7 + bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)" + select CPU_V7 + select ARCH_VEXPRESS + default y + select ARCH_MULTI_V6_V7 + +config ARCH_MULTI_V6_V7 + bool + +config ARCH_MULTI_CPU_AUTO + def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7) + select ARCH_MULTI_V5 + +endif + # # This is sorted alphabetically by mach-* pathname. However, plat-* # Kconfigs may be included either alphabetically (according to the @@ -1066,6 +1033,8 @@ source "arch/arm/mach-gemini/Kconfig" source "arch/arm/mach-h720x/Kconfig" +source "arch/arm/mach-highbank/Kconfig" + source "arch/arm/mach-integrator/Kconfig" source "arch/arm/mach-iop32x/Kconfig" @@ -1101,6 +1070,8 @@ source "arch/arm/mach-omap2/Kconfig" source "arch/arm/mach-orion5x/Kconfig" +source "arch/arm/mach-picoxcell/Kconfig" + source "arch/arm/mach-pxa/Kconfig" source "arch/arm/plat-pxa/Kconfig" @@ -1113,6 +1084,8 @@ source "arch/arm/mach-sa1100/Kconfig" source "arch/arm/plat-samsung/Kconfig" source "arch/arm/plat-s3c24xx/Kconfig" +source "arch/arm/mach-socfpga/Kconfig" + source "arch/arm/plat-spear/Kconfig" source "arch/arm/mach-s3c24xx/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 30eae87..fe6e05e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -135,84 +135,84 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -machine-$(CONFIG_ARCH_AT91) := at91 -machine-$(CONFIG_ARCH_BCMRING) := bcmring -machine-$(CONFIG_ARCH_CLPS711X) := clps711x -machine-$(CONFIG_ARCH_CNS3XXX) := cns3xxx -machine-$(CONFIG_ARCH_DAVINCI) := davinci -machine-$(CONFIG_ARCH_DOVE) := dove -machine-$(CONFIG_ARCH_EBSA110) := ebsa110 -machine-$(CONFIG_ARCH_EP93XX) := ep93xx -machine-$(CONFIG_ARCH_GEMINI) := gemini -machine-$(CONFIG_ARCH_H720X) := h720x -machine-$(CONFIG_ARCH_HIGHBANK) := highbank -machine-$(CONFIG_ARCH_INTEGRATOR) := integrator -machine-$(CONFIG_ARCH_IOP13XX) := iop13xx -machine-$(CONFIG_ARCH_IOP32X) := iop32x -machine-$(CONFIG_ARCH_IOP33X) := iop33x -machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx -machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood -machine-$(CONFIG_ARCH_KS8695) := ks8695 -machine-$(CONFIG_ARCH_LPC32XX) := lpc32xx -machine-$(CONFIG_ARCH_MMP) := mmp -machine-$(CONFIG_ARCH_MSM) := msm -machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 -machine-$(CONFIG_ARCH_IMX_V4_V5) := imx -machine-$(CONFIG_ARCH_IMX_V6_V7) := imx -machine-$(CONFIG_ARCH_MXS) := mxs -machine-$(CONFIG_ARCH_MVEBU) := mvebu -machine-$(CONFIG_ARCH_NETX) := netx -machine-$(CONFIG_ARCH_NOMADIK) := nomadik -machine-$(CONFIG_ARCH_OMAP1) := omap1 -machine-$(CONFIG_ARCH_OMAP2PLUS) := omap2 -machine-$(CONFIG_ARCH_ORION5X) := orion5x -machine-$(CONFIG_ARCH_PICOXCELL) := picoxcell -machine-$(CONFIG_ARCH_PNX4008) := pnx4008 -machine-$(CONFIG_ARCH_PRIMA2) := prima2 -machine-$(CONFIG_ARCH_PXA) := pxa -machine-$(CONFIG_ARCH_REALVIEW) := realview -machine-$(CONFIG_ARCH_RPC) := rpc -machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2440 -machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx -machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 -machine-$(CONFIG_ARCH_S5PC100) := s5pc100 -machine-$(CONFIG_ARCH_S5PV210) := s5pv210 -machine-$(CONFIG_ARCH_EXYNOS4) := exynos -machine-$(CONFIG_ARCH_EXYNOS5) := exynos -machine-$(CONFIG_ARCH_SA1100) := sa1100 -machine-$(CONFIG_ARCH_SHARK) := shark -machine-$(CONFIG_ARCH_SHMOBILE) := shmobile -machine-$(CONFIG_ARCH_TEGRA) := tegra -machine-$(CONFIG_ARCH_U300) := u300 -machine-$(CONFIG_ARCH_U8500) := ux500 -machine-$(CONFIG_ARCH_VERSATILE) := versatile -machine-$(CONFIG_ARCH_VEXPRESS) := vexpress -machine-$(CONFIG_ARCH_VT8500) := vt8500 -machine-$(CONFIG_ARCH_W90X900) := w90x900 -machine-$(CONFIG_FOOTBRIDGE) := footbridge -machine-$(CONFIG_ARCH_SOCFPGA) := socfpga -machine-$(CONFIG_MACH_SPEAR1310) := spear13xx -machine-$(CONFIG_MACH_SPEAR1340) := spear13xx -machine-$(CONFIG_MACH_SPEAR300) := spear3xx -machine-$(CONFIG_MACH_SPEAR310) := spear3xx -machine-$(CONFIG_MACH_SPEAR320) := spear3xx -machine-$(CONFIG_MACH_SPEAR600) := spear6xx -machine-$(CONFIG_ARCH_ZYNQ) := zynq +machine-$(CONFIG_ARCH_AT91) += at91 +machine-$(CONFIG_ARCH_BCMRING) += bcmring +machine-$(CONFIG_ARCH_CLPS711X) += clps711x +machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx +machine-$(CONFIG_ARCH_DAVINCI) += davinci +machine-$(CONFIG_ARCH_DOVE) += dove +machine-$(CONFIG_ARCH_EBSA110) += ebsa110 +machine-$(CONFIG_ARCH_EP93XX) += ep93xx +machine-$(CONFIG_ARCH_GEMINI) += gemini +machine-$(CONFIG_ARCH_H720X) += h720x +machine-$(CONFIG_ARCH_HIGHBANK) += highbank +machine-$(CONFIG_ARCH_INTEGRATOR) += integrator +machine-$(CONFIG_ARCH_IOP13XX) += iop13xx +machine-$(CONFIG_ARCH_IOP32X) += iop32x +machine-$(CONFIG_ARCH_IOP33X) += iop33x +machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx +machine-$(CONFIG_ARCH_KIRKWOOD) += kirkwood +machine-$(CONFIG_ARCH_KS8695) += ks8695 +machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx +machine-$(CONFIG_ARCH_MMP) += mmp +machine-$(CONFIG_ARCH_MSM) += msm +machine-$(CONFIG_ARCH_MV78XX0) += mv78xx0 +machine-$(CONFIG_ARCH_IMX_V4_V5) += imx +machine-$(CONFIG_ARCH_IMX_V6_V7) += imx +machine-$(CONFIG_ARCH_MXS) += mxs +machine-$(CONFIG_ARCH_MVEBU) += mvebu +machine-$(CONFIG_ARCH_NETX) += netx +machine-$(CONFIG_ARCH_NOMADIK) += nomadik +machine-$(CONFIG_ARCH_OMAP1) += omap1 +machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 +machine-$(CONFIG_ARCH_ORION5X) += orion5x +machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell +machine-$(CONFIG_ARCH_PNX4008) += pnx4008 +machine-$(CONFIG_ARCH_PRIMA2) += prima2 +machine-$(CONFIG_ARCH_PXA) += pxa +machine-$(CONFIG_ARCH_REALVIEW) += realview +machine-$(CONFIG_ARCH_RPC) += rpc +machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx s3c2412 s3c2440 +machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx +machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0 +machine-$(CONFIG_ARCH_S5PC100) += s5pc100 +machine-$(CONFIG_ARCH_S5PV210) += s5pv210 +machine-$(CONFIG_ARCH_EXYNOS4) += exynos +machine-$(CONFIG_ARCH_EXYNOS5) += exynos +machine-$(CONFIG_ARCH_SA1100) += sa1100 +machine-$(CONFIG_ARCH_SHARK) += shark +machine-$(CONFIG_ARCH_SHMOBILE) += shmobile +machine-$(CONFIG_ARCH_TEGRA) += tegra +machine-$(CONFIG_ARCH_U300) += u300 +machine-$(CONFIG_ARCH_U8500) += ux500 +machine-$(CONFIG_ARCH_VERSATILE) += versatile +machine-$(CONFIG_ARCH_VEXPRESS) += vexpress +machine-$(CONFIG_ARCH_VT8500) += vt8500 +machine-$(CONFIG_ARCH_W90X900) += w90x900 +machine-$(CONFIG_FOOTBRIDGE) += footbridge +machine-$(CONFIG_ARCH_SOCFPGA) += socfpga +machine-$(CONFIG_MACH_SPEAR1310) += spear13xx +machine-$(CONFIG_MACH_SPEAR1340) += spear13xx +machine-$(CONFIG_MACH_SPEAR300) += spear3xx +machine-$(CONFIG_MACH_SPEAR310) += spear3xx +machine-$(CONFIG_MACH_SPEAR320) += spear3xx +machine-$(CONFIG_MACH_SPEAR600) += spear6xx +machine-$(CONFIG_ARCH_ZYNQ) += zynq # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -plat-$(CONFIG_ARCH_MXC) := mxc -plat-$(CONFIG_ARCH_OMAP) := omap -plat-$(CONFIG_ARCH_S3C64XX) := samsung -plat-$(CONFIG_ARCH_ZYNQ) := versatile -plat-$(CONFIG_PLAT_IOP) := iop -plat-$(CONFIG_PLAT_NOMADIK) := nomadik -plat-$(CONFIG_PLAT_ORION) := orion -plat-$(CONFIG_PLAT_PXA) := pxa -plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx samsung -plat-$(CONFIG_PLAT_S5P) := samsung -plat-$(CONFIG_PLAT_SPEAR) := spear -plat-$(CONFIG_PLAT_VERSATILE) := versatile +plat-$(CONFIG_ARCH_MXC) += mxc +plat-$(CONFIG_ARCH_OMAP) += omap +plat-$(CONFIG_ARCH_S3C64XX) += samsung +plat-$(CONFIG_ARCH_ZYNQ) += versatile +plat-$(CONFIG_PLAT_IOP) += iop +plat-$(CONFIG_PLAT_NOMADIK) += nomadik +plat-$(CONFIG_PLAT_ORION) += orion +plat-$(CONFIG_PLAT_PXA) += pxa +plat-$(CONFIG_PLAT_S3C24XX) += s3c24xx samsung +plat-$(CONFIG_PLAT_S5P) += samsung +plat-$(CONFIG_PLAT_SPEAR) += spear +plat-$(CONFIG_PLAT_VERSATILE) += versatile ifeq ($(CONFIG_ARCH_EBSA110),y) # This is what happens if you forget the IOCS16 line. @@ -230,15 +230,20 @@ MACHINE := arch/arm/mach-$(word 1,$(machine-y))/ else MACHINE := endif +ifeq ($(CONFIG_ARCH_MULTIPLATFORM),y) +MACHINE := +endif machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y)) +ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y) ifeq ($(KBUILD_SRC),) KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs)) else KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs)) endif +endif export TEXT_OFFSET GZFLAGS MMUEXT diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 8e2a8fc..df89983 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -25,7 +25,13 @@ unsigned int __machine_arch_type; static void putstr(const char *ptr); extern void error(char *x); +#ifdef CONFIG_ARCH_MULTIPLATFORM +static inline void putc(int c) {} +static inline void flush(void) {} +static inline void arch_decomp_setup(void) {} +#else #include <mach/uncompress.h> +#endif #ifdef CONFIG_DEBUG_ICEDCC diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h index ce11944..963342a 100644 --- a/arch/arm/include/asm/timex.h +++ b/arch/arm/include/asm/timex.h @@ -13,7 +13,11 @@ #define _ASMARM_TIMEX_H #include <asm/arch_timer.h> +#ifdef CONFIG_ARCH_MULTIPLATFORM +#define CLOCK_TICK_RATE 1000000 +#else #include <mach/timex.h> +#endif typedef unsigned long cycles_t; diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig new file mode 100644 index 0000000..0e1d0a4 --- /dev/null +++ b/arch/arm/mach-highbank/Kconfig @@ -0,0 +1,15 @@ +config ARCH_HIGHBANK + bool "Calxeda ECX-1000 (Highbank)" if ARCH_MULTI_V7 + select ARCH_WANT_OPTIONAL_GPIOLIB + select ARM_AMBA + select ARM_GIC + select ARM_TIMER_SP804 + select CACHE_L2X0 + select CLKDEV_LOOKUP + select COMMON_CLK + select CPU_V7 + select GENERIC_CLOCKEVENTS + select HAVE_ARM_SCU + select HAVE_SMP + select SPARSE_IRQ + select USE_OF diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index caa2c5e..7b27035 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -1,3 +1,13 @@ +config ARCH_MVEBU + bool "Marvell SOCs with Device Tree support" if ARCH_MULTI_V7 + select CLKSRC_MMIO + select COMMON_CLK + select GENERIC_CLOCKEVENTS + select GENERIC_IRQ_CHIP + select IRQ_DOMAIN + select MULTI_IRQ_HANDLER + select SPARSE_IRQ + if ARCH_MVEBU menu "Marvell SOC with device tree" diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index e61d2b8..6ea8998 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -1,2 +1,4 @@ +ccflags-$(ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include + obj-y += system-controller.o obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o diff --git a/arch/arm/mach-picoxcell/Kconfig b/arch/arm/mach-picoxcell/Kconfig new file mode 100644 index 0000000..868796f --- /dev/null +++ b/arch/arm/mach-picoxcell/Kconfig @@ -0,0 +1,14 @@ +config ARCH_PICOXCELL + bool "Picochip PicoXcell" if ARCH_MULTI_V6 + select ARCH_REQUIRE_GPIOLIB + select ARM_PATCH_PHYS_VIRT + select ARM_VIC + select CPU_V6K + select DW_APB_TIMER + select DW_APB_TIMER_OF + select GENERIC_CLOCKEVENTS + select GENERIC_GPIO + select HAVE_TCM + select NO_IOPORT + select SPARSE_IRQ + select USE_OF diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig new file mode 100644 index 0000000..803a328 --- /dev/null +++ b/arch/arm/mach-socfpga/Kconfig @@ -0,0 +1,16 @@ +config ARCH_SOCFPGA + bool "Altera SOCFPGA family" if ARCH_MULTI_V7 + select ARCH_WANT_OPTIONAL_GPIOLIB + select ARM_AMBA + select ARM_GIC + select CACHE_L2X0 + select CLKDEV_LOOKUP + select COMMON_CLK + select CPU_V7 + select DW_APB_TIMER + select DW_APB_TIMER_OF + select GENERIC_CLOCKEVENTS + select GPIO_PL061 if GPIOLIB + select HAVE_ARM_SCU + select SPARSE_IRQ + select USE_OF diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index fc3730f..498ea15 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -1,3 +1,19 @@ +config ARCH_VEXPRESS + bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7 + select ARCH_WANT_OPTIONAL_GPIOLIB + select ARM_AMBA + select ARM_TIMER_SP804 + select CLKDEV_LOOKUP + select COMMON_CLK + select GENERIC_CLOCKEVENTS + select HAVE_CLK + select HAVE_PATA_PLATFORM + select ICST + select NO_IOPORT + select PLAT_VERSATILE + select PLAT_VERSATILE_CLCD + select REGULATOR_FIXED_VOLTAGE if REGULATOR + menu "Versatile Express platform type" depends on ARCH_VEXPRESS diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile index 90551b9..42703e8 100644 --- a/arch/arm/mach-vexpress/Makefile +++ b/arch/arm/mach-vexpress/Makefile @@ -1,6 +1,8 @@ # # Makefile for the linux kernel. # +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ + -I$(srctree)/arch/arm/plat-versatile/include obj-y := v2m.o obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile index 272769a8..74cfd94 100644 --- a/arch/arm/plat-versatile/Makefile +++ b/arch/arm/plat-versatile/Makefile @@ -1,3 +1,5 @@ +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include + obj-$(CONFIG_PLAT_VERSATILE_CLOCK) += clock.o obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o