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
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Stefan Agner <stefan@agner.ch>
Subject: [PATCH v2 08/12] ARM: allow MULTIPLATFORM with !MMU
Date: Tue, 30 Dec 2014 00:32:11 +0100 [thread overview]
Message-ID: <1419895935-22966-9-git-send-email-stefan@agner.ch> (raw)
In-Reply-To: <1419895935-22966-1-git-send-email-stefan@agner.ch>
In order to support SoC with heterogenous CPU architectures (such
as Freescale Vybrid/i.MXSX) it is preferable to use the same
architecture (ARCH_MXC in this case) for the MMU enabled and !MMU
CPU. Hence allow to select MULTIPLATFORM even without MMU.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/Kconfig | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 97d07ed..95007b9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -228,7 +228,7 @@ config VECTORS_BASE
in size.
config ARM_PATCH_PHYS_VIRT
- bool "Patch physical to virtual translations at runtime" if EMBEDDED
+ bool "Patch physical to virtual translations at runtime" if EMBEDDED || (ARCH_MULTIPLATFORM && MMU)
default y
depends on !XIP_KERNEL && MMU
depends on !ARCH_REALVIEW || !SPARSEMEM
@@ -303,15 +303,12 @@ config MMU
#
choice
prompt "ARM system type"
- default ARCH_VERSATILE if !MMU
- default ARCH_MULTIPLATFORM if MMU
+ default ARCH_MULTIPLATFORM
config ARCH_MULTIPLATFORM
bool "Allow multiple platforms to be selected"
- depends on MMU
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_HAS_SG_CHAIN
- select ARM_PATCH_PHYS_VIRT
select AUTO_ZRELADDR
select CLKSRC_OF
select COMMON_CLK
@@ -783,13 +780,13 @@ comment "CPU Core family selection"
config ARCH_MULTI_V4
bool "ARMv4 based platforms (FA526)"
- depends on !ARCH_MULTI_V6_V7
+ depends on !ARCH_MULTI_V6_V7 && MMU
select ARCH_MULTI_V4_V5
select CPU_FA526
config ARCH_MULTI_V4T
bool "ARMv4T based platforms (ARM720T, ARM920T, ...)"
- depends on !ARCH_MULTI_V6_V7
+ depends on !ARCH_MULTI_V6_V7 && MMU
select ARCH_MULTI_V4_V5
select CPU_ARM920T if !(CPU_ARM7TDMI || CPU_ARM720T || \
CPU_ARM740T || CPU_ARM9TDMI || CPU_ARM922T || \
@@ -797,7 +794,7 @@ config ARCH_MULTI_V4T
config ARCH_MULTI_V5
bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)"
- depends on !ARCH_MULTI_V6_V7
+ depends on !ARCH_MULTI_V6_V7 && MMU
select ARCH_MULTI_V4_V5
select CPU_ARM926T if !(CPU_ARM946E || CPU_ARM1020 || \
CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \
@@ -808,11 +805,13 @@ config ARCH_MULTI_V4_V5
config ARCH_MULTI_V6
bool "ARMv6 based platforms (ARM11)"
+ depends on MMU
select ARCH_MULTI_V6_V7
select CPU_V6K
config ARCH_MULTI_V7
- bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
+ bool "ARMv7-A based platforms (Cortex-A, PJ4, Scorpion, Krait)"
+ depends on MMU
default y
select ARCH_MULTI_V6_V7
select CPU_V7
@@ -823,7 +822,7 @@ config ARCH_MULTI_V6_V7
select MIGHT_HAVE_CACHE_L2X0
config ARCH_MULTI_CPU_AUTO
- def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7)
+ def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7) && MMU
select ARCH_MULTI_V5
endmenu
@@ -1960,7 +1959,7 @@ endchoice
config XIP_KERNEL
bool "Kernel Execute-In-Place from ROM"
- depends on !ARM_LPAE && !ARCH_MULTIPLATFORM
+ depends on !ARM_LPAE && (!ARCH_MULTIPLATFORM || ARCH_MULTI_V7M)
help
Execute-In-Place allows the kernel to run from non-volatile storage
directly addressable by the CPU, such as NOR flash. This saves RAM
--
2.2.1
next prev parent reply other threads:[~2014-12-29 23:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-29 23:32 [PATCH v2 00/12] ARM: vf610m4: Add Vybrid Cortex-M4 support Stefan Agner
2014-12-29 23:32 ` [PATCH v2 02/12] irqchip: nvic: support hierarchy irq domain Stefan Agner
2014-12-29 23:32 ` [PATCH v2 03/12] irqchip: vf610-mscm: support NVIC parent Stefan Agner
2014-12-29 23:32 ` [PATCH v2 04/12] irqchip: nvic: increase number of external interrupts to 112 Stefan Agner
2014-12-29 23:32 ` [PATCH v2 05/12] clocksource: add dependencies for Vybrid pit clocksource Stefan Agner
2014-12-29 23:32 ` [PATCH v2 06/12] ARM: unify MMU/!MMU addruart calls Stefan Agner
2014-12-29 23:32 ` [PATCH v2 07/12] ARM: imx: depend MXC debug board on 3DS machines Stefan Agner
2014-12-30 10:42 ` Sergei Shtylyov
2014-12-29 23:32 ` Stefan Agner [this message]
2014-12-30 21:42 ` [PATCH v2 08/12] ARM: allow MULTIPLATFORM with !MMU Rob Herring
[not found] ` <CAL_JsqK94Pk2xPF1MMX0GU0CQEiwiDD2qv9v3k4WLg2znDVjgA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-12-30 22:02 ` Stefan Agner
[not found] ` <8ec6bcf0fe2ec13898cf6c259d9da559-XLVq0VzYD2Y@public.gmane.org>
2014-12-30 22:27 ` Arnd Bergmann
2014-12-29 23:32 ` [PATCH v2 09/12] ARM: efm32: move into multiplatform Stefan Agner
[not found] ` <1419895935-22966-10-git-send-email-stefan-XLVq0VzYD2Y@public.gmane.org>
2015-01-02 9:50 ` Uwe Kleine-König
2014-12-29 23:32 ` [PATCH v2 10/12] ARM: vf610: enable Cortex-M4 on Vybrid SoC Stefan Agner
2014-12-29 23:32 ` [PATCH v2 11/12] ARM: dts: add support for Vybrid running on Cortex-M4 Stefan Agner
[not found] ` <1419895935-22966-1-git-send-email-stefan-XLVq0VzYD2Y@public.gmane.org>
2014-12-29 23:32 ` [PATCH v2 01/12] genirq: generic chip: support hierarchy domain Stefan Agner
2014-12-29 23:32 ` [PATCH v2 12/12] ARM: vf610m4: add defconfig for Linux on Vybrids Cortex-M4 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=1419895935-22966-9-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=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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).