Commit 8064887e authored by Stefan Agner's avatar Stefan Agner Committed by Arnd Bergmann

ARM: vf610: enable Cortex-M4 configuration on Vybrid SoC

This patch allows to build the Kernel for Vybrid (VF6xx) SoC
when ARMv7-M CPU is selected. The resulting image runs on the
secondary Cortex-M4 core. This core has equally access to all
peripherals as the main Cortex-A5 core. However, there is no
resource control mechanism, hence when both cores are used
simultaneously, orthogonal device tree's are required.

The boot CPU is dependent on the SoC variant. The available
boards use mostly variants where the Cortex-A5 is the primary
and hence the boot CPU. Booting the secondary Cortex-M4 CPU
needs SoC specific registers written. There is no in kernel
support for this right now, a external userspace utility
called "m4boot" can be used to boot the kernel:

m4boot xipImage initramfs.cpio.lzo vf610m4-colibri.dtb
Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 9c77bc43
...@@ -81,12 +81,15 @@ Freescale Vybrid Platform Device Tree Bindings ...@@ -81,12 +81,15 @@ Freescale Vybrid Platform Device Tree Bindings
For the Vybrid SoC familiy all variants with DDR controller are supported, For the Vybrid SoC familiy all variants with DDR controller are supported,
which is the VF5xx and VF6xx series. Out of historical reasons, in most which is the VF5xx and VF6xx series. Out of historical reasons, in most
places the kernel uses vf610 to refer to the whole familiy. places the kernel uses vf610 to refer to the whole familiy.
The compatible string "fsl,vf610m4" is used for the secondary Cortex-M4
core support.
Required root node compatible property (one of them): Required root node compatible property (one of them):
- compatible = "fsl,vf500"; - compatible = "fsl,vf500";
- compatible = "fsl,vf510"; - compatible = "fsl,vf510";
- compatible = "fsl,vf600"; - compatible = "fsl,vf600";
- compatible = "fsl,vf610"; - compatible = "fsl,vf610";
- compatible = "fsl,vf610m4";
Freescale LS1021A Platform Device Tree Bindings Freescale LS1021A Platform Device Tree Bindings
------------------------------------------------ ------------------------------------------------
......
menuconfig ARCH_MXC menuconfig ARCH_MXC
bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select CLKSRC_MMIO select CLKSRC_MMIO
...@@ -496,10 +496,10 @@ config MACH_VPR200 ...@@ -496,10 +496,10 @@ config MACH_VPR200
endif endif
if ARCH_MULTI_V5
comment "Device tree only" comment "Device tree only"
if ARCH_MULTI_V5
config SOC_IMX25 config SOC_IMX25
bool "i.MX25 support" bool "i.MX25 support"
select ARCH_MXC_IOMUX_V3 select ARCH_MXC_IOMUX_V3
...@@ -512,7 +512,7 @@ endif ...@@ -512,7 +512,7 @@ endif
if ARCH_MULTI_V7 if ARCH_MULTI_V7
comment "Device tree only" comment "Cortex-A platforms"
config SOC_IMX5 config SOC_IMX5
bool bool
...@@ -582,10 +582,24 @@ config SOC_IMX6SX ...@@ -582,10 +582,24 @@ config SOC_IMX6SX
help help
This enables support for Freescale i.MX6 SoloX processor. This enables support for Freescale i.MX6 SoloX processor.
config SOC_LS1021A
bool "Freescale LS1021A support"
select ARM_GIC
select HAVE_ARM_ARCH_TIMER
select PCI_DOMAINS if PCI
select ZONE_DMA if ARM_LPAE
help
This enables support for Freescale LS1021A processor.
endif
comment "Cortex-A/Cortex-M asymmetric multiprocessing platforms"
if ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M
config SOC_VF610 config SOC_VF610
bool "Vybrid Family VF610 support" bool "Vybrid Family VF610 support"
select IRQ_DOMAIN_HIERARCHY select ARM_GIC if ARCH_MULTI_V7
select ARM_GIC
select PINCTRL_VF610 select PINCTRL_VF610
select PL310_ERRATA_769419 if CACHE_L2X0 select PL310_ERRATA_769419 if CACHE_L2X0
select SMP_ON_UP if SMP select SMP_ON_UP if SMP
...@@ -599,7 +613,7 @@ choice ...@@ -599,7 +613,7 @@ choice
default VF_USE_ARM_GLOBAL_TIMER default VF_USE_ARM_GLOBAL_TIMER
config VF_USE_ARM_GLOBAL_TIMER config VF_USE_ARM_GLOBAL_TIMER
bool "Use ARM Global Timer" bool "Use ARM Global Timer" if ARCH_MULTI_V7
select ARM_GLOBAL_TIMER select ARM_GLOBAL_TIMER
select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
help help
...@@ -613,16 +627,6 @@ choice ...@@ -613,16 +627,6 @@ choice
endchoice endchoice
config SOC_LS1021A
bool "Freescale LS1021A support"
select ARM_GIC
select HAVE_ARM_ARCH_TIMER
select PCI_DOMAINS if PCI
select ZONE_DMA if ARM_LPAE
help
This enables support for Freescale LS1021A processor.
endif endif
source "arch/arm/mach-imx/devices/Kconfig" source "arch/arm/mach-imx/devices/Kconfig"
......
...@@ -17,6 +17,7 @@ static const char * const vf610_dt_compat[] __initconst = { ...@@ -17,6 +17,7 @@ static const char * const vf610_dt_compat[] __initconst = {
"fsl,vf510", "fsl,vf510",
"fsl,vf600", "fsl,vf600",
"fsl,vf610", "fsl,vf610",
"fsl,vf610m4",
NULL, NULL,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment