From: Stefan Agner <stefan@agner.ch> To: shawn.guo@linaro.org, kernel@pengutronix.de, linux@arm.linux.org.uk, u.kleine-koenig@pengutronix.de, jason@lakedaemon.net, olof@lixom.net, arnd@arndb.de, daniel.lezcano@linaro.org, tglx@linutronix.de, mark.rutland@arm.com, pawel.moll@arm.com, robh+dt@kernel.org, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, marc.zyngier@arm.com, mcoquelin.stm32@gmail.com Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stefan Agner <stefan@agner.ch> Subject: [PATCH v3 09/12] ARM: efm32: move into multiplatform Date: Fri, 13 Mar 2015 00:36:17 +0100 [thread overview] Message-ID: <1426203380-7155-10-git-send-email-stefan@agner.ch> (raw) In-Reply-To: <1426203380-7155-1-git-send-email-stefan@agner.ch> From: Arnd Bergmann <arnd@arndb.de> Since the multiplatform configuration can support no-MMU kernels now, there is nothing stopping us from moving the efm32 platform in there as well. This introduces a new ARCH_MULTI_V7M CPU architecture selection option, since v7-M is incompatible with v7-A, and we can have either of the two enabled for multiplatform, but not both at the same time. Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Stefan Agner <stefan@agner.ch> --- arch/arm/Kconfig | 33 ++++++++++++++------------------- arch/arm/configs/efm32_defconfig | 2 ++ 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 636cb3f..51d1750 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -316,7 +316,7 @@ config ARCH_MULTIPLATFORM select COMMON_CLK select GENERIC_CLOCKEVENTS select MIGHT_HAVE_PCI - select MULTI_IRQ_HANDLER + select MULTI_IRQ_HANDLER if !ARCH_MULTI_V7M select SPARSE_IRQ select USE_OF @@ -402,24 +402,6 @@ config ARCH_EBSA110 Ethernet interface, two PCMCIA sockets, two serial ports and a parallel port. -config ARCH_EFM32 - bool "Energy Micro efm32" - depends on !MMU - select ARCH_REQUIRE_GPIOLIB - select ARM_NVIC - select AUTO_ZRELADDR - select CLKSRC_OF - select COMMON_CLK - select CPU_V7M - select GENERIC_CLOCKEVENTS - select NO_DMA - select NO_IOPORT_MAP - select SPARSE_IRQ - select USE_OF - help - Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko - processors. - config ARCH_EP93XX bool "EP93xx-based" select ARCH_HAS_HOLES_MEMORYMODEL @@ -780,6 +762,13 @@ menu "Multiple platform selection" comment "CPU Core family selection" +config ARCH_MULTI_V7M + bool "ARMv7-M based platforms (Cortex-M)" + depends on !MMU && !(ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7) + select CPU_V7M + select ARM_NVIC + select NO_IOPORT_MAP + config ARCH_MULTI_V4 bool "ARMv4 based platforms (FA526)" depends on !ARCH_MULTI_V6_V7 && MMU @@ -836,6 +825,12 @@ config ARCH_VIRT select ARM_PSCI select HAVE_ARM_ARCH_TIMER +config ARCH_EFM32 + bool "Energy Micro efm32" if ARCH_MULTI_V7M + help + Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko + processors. + # # This is sorted alphabetically by mach-* pathname. However, plat-* # Kconfigs may be included either alphabetically (according to the diff --git a/arch/arm/configs/efm32_defconfig b/arch/arm/configs/efm32_defconfig index c4c17e3..f58cb28 100644 --- a/arch/arm/configs/efm32_defconfig +++ b/arch/arm/configs/efm32_defconfig @@ -16,6 +16,8 @@ CONFIG_EMBEDDED=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set # CONFIG_MMU is not set +# CONFIG_ARCH_MULTI_V7 is not set +CONFIG_ARCH_MULTI_V7M=y CONFIG_ARCH_EFM32=y CONFIG_SET_MEM_PARAM=y CONFIG_DRAM_BASE=0x88000000 -- 2.3.1
WARNING: multiple messages have this Message-ID (diff)
From: stefan@agner.ch (Stefan Agner) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 09/12] ARM: efm32: move into multiplatform Date: Fri, 13 Mar 2015 00:36:17 +0100 [thread overview] Message-ID: <1426203380-7155-10-git-send-email-stefan@agner.ch> (raw) In-Reply-To: <1426203380-7155-1-git-send-email-stefan@agner.ch> From: Arnd Bergmann <arnd@arndb.de> Since the multiplatform configuration can support no-MMU kernels now, there is nothing stopping us from moving the efm32 platform in there as well. This introduces a new ARCH_MULTI_V7M CPU architecture selection option, since v7-M is incompatible with v7-A, and we can have either of the two enabled for multiplatform, but not both at the same time. Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Stefan Agner <stefan@agner.ch> --- arch/arm/Kconfig | 33 ++++++++++++++------------------- arch/arm/configs/efm32_defconfig | 2 ++ 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 636cb3f..51d1750 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -316,7 +316,7 @@ config ARCH_MULTIPLATFORM select COMMON_CLK select GENERIC_CLOCKEVENTS select MIGHT_HAVE_PCI - select MULTI_IRQ_HANDLER + select MULTI_IRQ_HANDLER if !ARCH_MULTI_V7M select SPARSE_IRQ select USE_OF @@ -402,24 +402,6 @@ config ARCH_EBSA110 Ethernet interface, two PCMCIA sockets, two serial ports and a parallel port. -config ARCH_EFM32 - bool "Energy Micro efm32" - depends on !MMU - select ARCH_REQUIRE_GPIOLIB - select ARM_NVIC - select AUTO_ZRELADDR - select CLKSRC_OF - select COMMON_CLK - select CPU_V7M - select GENERIC_CLOCKEVENTS - select NO_DMA - select NO_IOPORT_MAP - select SPARSE_IRQ - select USE_OF - help - Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko - processors. - config ARCH_EP93XX bool "EP93xx-based" select ARCH_HAS_HOLES_MEMORYMODEL @@ -780,6 +762,13 @@ menu "Multiple platform selection" comment "CPU Core family selection" +config ARCH_MULTI_V7M + bool "ARMv7-M based platforms (Cortex-M)" + depends on !MMU && !(ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7) + select CPU_V7M + select ARM_NVIC + select NO_IOPORT_MAP + config ARCH_MULTI_V4 bool "ARMv4 based platforms (FA526)" depends on !ARCH_MULTI_V6_V7 && MMU @@ -836,6 +825,12 @@ config ARCH_VIRT select ARM_PSCI select HAVE_ARM_ARCH_TIMER +config ARCH_EFM32 + bool "Energy Micro efm32" if ARCH_MULTI_V7M + help + Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko + processors. + # # This is sorted alphabetically by mach-* pathname. However, plat-* # Kconfigs may be included either alphabetically (according to the diff --git a/arch/arm/configs/efm32_defconfig b/arch/arm/configs/efm32_defconfig index c4c17e3..f58cb28 100644 --- a/arch/arm/configs/efm32_defconfig +++ b/arch/arm/configs/efm32_defconfig @@ -16,6 +16,8 @@ CONFIG_EMBEDDED=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set # CONFIG_MMU is not set +# CONFIG_ARCH_MULTI_V7 is not set +CONFIG_ARCH_MULTI_V7M=y CONFIG_ARCH_EFM32=y CONFIG_SET_MEM_PARAM=y CONFIG_DRAM_BASE=0x88000000 -- 2.3.1
next prev parent reply other threads:[~2015-03-12 23:37 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-12 23:36 [PATCH v3 00/12] ARM: vf610m4: Add Vybrid Cortex-M4 support Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` [PATCH v3 01/12] genirq: generic chip: support hierarchy domain Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` [PATCH v3 02/12] irqchip: nvic: support hierarchy irq domain Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-13 17:35 ` Maxime Coquelin 2015-03-13 17:35 ` Maxime Coquelin 2015-03-13 17:35 ` Maxime Coquelin 2015-03-12 23:36 ` [PATCH v3 03/12] irqchip: vf610-mscm: support NVIC parent Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-23 0:11 ` Jason Cooper 2015-03-23 0:11 ` Jason Cooper 2015-03-23 0:11 ` Jason Cooper 2015-03-23 8:44 ` Stefan Agner 2015-03-23 8:44 ` Stefan Agner 2015-03-23 8:44 ` Stefan Agner 2015-03-12 23:36 ` [PATCH v3 04/12] ARM: ARMv7M: define size of vector table for Vybrid Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` [PATCH v3 05/12] clocksource: add dependencies for Vybrid pit clocksource Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-13 10:25 ` Daniel Lezcano 2015-03-13 10:25 ` Daniel Lezcano 2015-03-12 23:36 ` [PATCH v3 06/12] ARM: unify MMU/!MMU addruart calls Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` [PATCH v3 07/12] ARM: imx: depend MXC debug board on 3DS machines Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-13 13:55 ` Shawn Guo 2015-03-13 13:55 ` Shawn Guo 2015-03-13 13:55 ` Shawn Guo 2015-03-12 23:36 ` [PATCH v3 08/12] ARM: allow MULTIPLATFORM with !MMU Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` Stefan Agner [this message] 2015-03-12 23:36 ` [PATCH v3 09/12] ARM: efm32: move into multiplatform Stefan Agner 2015-03-12 23:36 ` [PATCH v3 10/12] ARM: vf610: enable Cortex-M4 on Vybrid SoC Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` [PATCH v3 11/12] ARM: dts: add support for Vybrid running on Cortex-M4 Stefan Agner 2015-03-12 23:36 ` Stefan Agner 2015-03-12 23:36 ` [PATCH v3 12/12] ARM: vf610m4: add defconfig for Linux on Vybrids Cortex-M4 Stefan Agner 2015-03-12 23:36 ` Stefan Agner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1426203380-7155-10-git-send-email-stefan@agner.ch \ --to=stefan@agner.ch \ --cc=arnd@arndb.de \ --cc=daniel.lezcano@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=galak@codeaurora.org \ --cc=ijc+devicetree@hellion.org.uk \ --cc=jason@lakedaemon.net \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=mcoquelin.stm32@gmail.com \ --cc=olof@lixom.net \ --cc=pawel.moll@arm.com \ --cc=robh+dt@kernel.org \ --cc=shawn.guo@linaro.org \ --cc=tglx@linutronix.de \ --cc=u.kleine-koenig@pengutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.