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

Commit a89cf59b authored by Sascha Hauer's avatar Sascha Hauer Committed by Arnd Bergmann
Browse files

arm/imx: merge i.MX3 and i.MX6 



The patch merges the build of imx3 and imx6.  The Kconfig symbol
ARCH_IMX_V6_V7 is introduced to replace ARCH_MX3 and ARCH_MX6.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent a1f1c7ef

arch/arm/Makefile

+1 −2
Original line number Original line Diff line number Diff line
@@ -158,9 +158,8 @@ machine-$(CONFIG_ARCH_MMP) := mmp 
machine-$(CONFIG_ARCH_MSM)		:= msm

machine-$(CONFIG_ARCH_MSM)		:= msm

machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0

machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0

machine-$(CONFIG_ARCH_IMX_V4_V5)	:= imx

machine-$(CONFIG_ARCH_IMX_V4_V5)	:= imx

machine-$(CONFIG_ARCH_MX3)		:= imx

machine-$(CONFIG_ARCH_IMX_V6_V7)	:= imx

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MX6)		:= imx

machine-$(CONFIG_ARCH_MXS)		:= mxs

machine-$(CONFIG_ARCH_MXS)		:= mxs

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

arch/arm/mach-imx/Kconfig

+3 −4
Original line number Original line Diff line number Diff line
@@ -74,6 +74,7 @@ config SOC_IMX31 
	select ARCH_MXC_AUDMUX_V2

	select ARCH_MXC_AUDMUX_V2

	select ARCH_MX31

	select ARCH_MX31

	select MXC_AVIC

	select MXC_AVIC

	select SMP_ON_UP if SMP





config SOC_IMX35

config SOC_IMX35

	bool

	bool
@@ -83,6 +84,7 @@ config SOC_IMX35 
	select HAVE_EPIT

	select HAVE_EPIT

	select ARCH_MX35

	select ARCH_MX35

	select MXC_AVIC

	select MXC_AVIC

	select SMP_ON_UP if SMP









if ARCH_IMX_V4_V5

if ARCH_IMX_V4_V5
@@ -351,7 +353,7 @@ config MACH_IMX27IPCAM 




endif

endif





if ARCH_MX3

if ARCH_IMX_V6_V7





comment "MX31 platforms:"

comment "MX31 platforms:"
@@ -601,9 +603,6 @@ config MACH_VPR200 
	  Include support for VPR200 platform. This includes specific

	  Include support for VPR200 platform. This includes specific

	  configurations for the board and its peripherals.

	  configurations for the board and its peripherals.





endif



if ARCH_MX6

comment "i.MX6 family:"

comment "i.MX6 family:"





config SOC_IMX6Q

config SOC_IMX6Q

arch/arm/mm/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -819,10 +819,10 @@ config CACHE_FEROCEON_L2_WRITETHROUGH 
config CACHE_L2X0

config CACHE_L2X0

	bool "Enable the L2x0 outer cache controller"

	bool "Enable the L2x0 outer cache controller"

	depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \

	depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \

		   REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \

		   REALVIEW_EB_A9MP || ARCH_IMX_V6_V7 || MACH_REALVIEW_PBX || \

		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \

		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \

		   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \

		   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \

		   ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX || ARCH_MX6

		   ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX

	default y

	default y

	select OUTER_CACHE

	select OUTER_CACHE

	select OUTER_CACHE_SYNC

	select OUTER_CACHE_SYNC

arch/arm/plat-mxc/Kconfig

+7 −11
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ menu "Freescale MXC Implementations" 




choice

choice

	prompt "Freescale CPU family:"

	prompt "Freescale CPU family:"

	default ARCH_MX3

	default ARCH_IMX_V6_V7





config ARCH_IMX_V4_V5

config ARCH_IMX_V4_V5

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

	bool "i.MX1, i.MX21, i.MX25, i.MX27"
@@ -16,10 +16,13 @@ config ARCH_IMX_V4_V5 
	  This enables support for systems based on the Freescale i.MX ARMv4

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

	  and ARMv5 SoCs

	  and ARMv5 SoCs





config ARCH_MX3

config ARCH_IMX_V6_V7

	bool "MX3-based"

	bool "i.MX3, i.MX6"

	select AUTO_ZRELADDR if !ZBOOT_ROM

	select ARM_PATCH_PHYS_VIRT

	help

	help

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

	  This enables support for systems based on the Freescale i.MX3 and i.MX6

	  family.





config ARCH_MX5

config ARCH_MX5

	bool "i.MX50, i.MX51, i.MX53"

	bool "i.MX50, i.MX51, i.MX53"
@@ -29,13 +32,6 @@ config ARCH_MX5 
	  This enables support for machines using Freescale's i.MX50 and i.MX51

	  This enables support for machines using Freescale's i.MX50 and i.MX51

	  processors.

	  processors.





config ARCH_MX6

	bool "i.MX6"

	select AUTO_ZRELADDR if !ZBOOT_ROM

	select ARM_PATCH_PHYS_VIRT

	help

	  This enables support for systems based on the Freescale i.MX6 family



endchoice

endchoice





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

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