Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3995eb82 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: merge plat-mxc into mach-imx 



It's really unnecessary to have plat-mxc, and let's merge it into
mach-imx.  It's pretty much just a bunch of file renaming and
Kconfig/Makefile merge.

To make the change less invasive, we keep using Kconfig symbol
CONFIG_ARCH_MXC for mach-imx sub-architecture.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent e0557c0d

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -789,7 +789,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

T:	git git://git.pengutronix.de/git/imx/linux-2.6.git

F:	arch/arm/mach-imx/

F:	arch/arm/plat-mxc/

F:	arch/arm/configs/imx*_defconfig



ARM/FREESCALE IMX6

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ source "arch/arm/mach-msm/Kconfig" 


source "arch/arm/mach-mv78xx0/Kconfig"



source "arch/arm/plat-mxc/Kconfig"

source "arch/arm/mach-imx/Kconfig"



source "arch/arm/mach-mxs/Kconfig"

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ 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

arch/arm/mach-imx/Kconfig

+80 −0
Original line number Diff line number Diff line 
if ARCH_MXC



config MXC_IRQ_PRIOR

	bool "Use IRQ priority"

	help

	  Select this if you want to use prioritized IRQ handling.

	  This feature prevents higher priority ISR to be interrupted

	  by lower priority IRQ even IRQF_DISABLED flag is not set.

	  This may be useful in embedded applications, where are strong

	  requirements for timing.

	  Say N here, unless you have a specialized requirement.



config MXC_TZIC

	bool



config MXC_AVIC

	bool



config MXC_DEBUG_BOARD

	bool "Enable MXC debug board(for 3-stack)"

	help

	  The debug board is an integral part of the MXC 3-stack(PDK)

	  platforms, it can be attached or removed from the peripheral

	  board. On debug board, several debug devices(ethernet, UART,

	  buttons, LEDs and JTAG) are implemented. Between the MCU and

	  these devices, a CPLD is added as a bridge which performs

	  data/address de-multiplexing and decode, signal level shift,

	  interrupt control and various board functions.



config HAVE_EPIT

	bool



config MXC_USE_EPIT

	bool "Use EPIT instead of GPT"

	depends on HAVE_EPIT

	help

	  Use EPIT as the system timer on systems that have it. Normally you

	  don't have a reason to do so as the EPIT has the same features and

	  uses the same clocks as the GPT. Anyway, on some systems the GPT

	  may be in use for other purposes.



config MXC_ULPI

	bool



config ARCH_HAS_RNGA

	bool



config IRAM_ALLOC

	bool

	select GENERIC_ALLOCATOR



config HAVE_IMX_GPC

	bool
@@ -110,6 +161,20 @@ config SOC_IMX51 
	select PINCTRL_IMX51

	select SOC_IMX5



menu "Freescale MXC Implementations"



choice

	prompt "Freescale CPU family:"

	default ARCH_IMX_V6_V7



config ARCH_IMX_V4_V5

	bool "i.MX1, i.MX21, i.MX25, i.MX27"

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR if !ZBOOT_ROM

	help

	  This enables support for systems based on the Freescale i.MX ARMv4

	  and ARMv5 SoCs



if ARCH_IMX_V4_V5



comment "MX1 platforms:"
@@ -390,6 +455,15 @@ config MACH_IMX27_DT 


endif



config ARCH_IMX_V6_V7

	bool "i.MX3, i.MX5, i.MX6"

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR if !ZBOOT_ROM

	select MIGHT_HAVE_CACHE_L2X0

	help

	  This enables support for systems based on the Freescale i.MX3, i.MX5

	  and i.MX6 family.



if ARCH_IMX_V6_V7



comment "MX31 platforms:"
@@ -773,4 +847,10 @@ config SOC_IMX6Q 


endif



endchoice



endmenu



source "arch/arm/mach-imx/devices/Kconfig"



endif