Commit 7409cd1c authored by Sascha Hauer's avatar Sascha Hauer
Browse files

ARM i.MX: allow to compile together all i.MX5 based SoCs 



For this we need CONFIG_AUTO_ZRELADDR and CONFIG_ARM_PATCH_PHYS_VIRT.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent ae4fa7f6

arch/arm/mach-mx5/Kconfig

+4 −14
Original line number Original line Diff line number Diff line 
if ARCH_MX503 || ARCH_MX51

if ARCH_MX5



# ARCH_MX5/50/53 are left to mark places where prevent multi-soc in single

# ARCH_MX5/50/53 are left to mark places where prevent multi-soc in single

# image. So for most time, SOC_IMX50/51/53 should be used.

# image. So for most time, SOC_IMX50/51/53 should be used.





config ARCH_MX5

config ARCH_MX51

	bool

	bool





config ARCH_MX50

config ARCH_MX50
@@ -19,7 +20,6 @@ config SOC_IMX50 
	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_AUDMUX_V2

	select ARCH_MXC_AUDMUX_V2

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_CPUFREQ

	select ARCH_MX5

	select ARCH_MX50

	select ARCH_MX50





config	SOC_IMX51

config	SOC_IMX51
@@ -30,7 +30,7 @@ config SOC_IMX51 
	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_AUDMUX_V2

	select ARCH_MXC_AUDMUX_V2

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_CPUFREQ

	select ARCH_MX5

	select ARCH_MX51





config	SOC_IMX53

config	SOC_IMX53

	bool

	bool
@@ -38,10 +38,8 @@ config SOC_IMX53 
	select ARM_L1_CACHE_SHIFT_6

	select ARM_L1_CACHE_SHIFT_6

	select MXC_TZIC

	select MXC_TZIC

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_IOMUX_V3

	select ARCH_MX5

	select ARCH_MX53

	select ARCH_MX53





if ARCH_MX50_SUPPORTED

#comment "i.MX50 machines:"

#comment "i.MX50 machines:"





config MACH_MX50_RDP

config MACH_MX50_RDP
@@ -57,9 +55,6 @@ config MACH_MX50_RDP 
	  Include support for MX50 reference design platform (RDP) board. This

	  Include support for MX50 reference design platform (RDP) board. This

	  includes specific configurations for the board and its peripherals.

	  includes specific configurations for the board and its peripherals.





endif # ARCH_MX50_SUPPORTED



if ARCH_MX51

comment "i.MX51 machines:"

comment "i.MX51 machines:"





config MACH_MX51_BABBAGE

config MACH_MX51_BABBAGE
@@ -167,9 +162,6 @@ config MACH_MX51_EFIKASB 
	  Include support for Genesi Efika Smartbook. This includes specific

	  Include support for Genesi Efika Smartbook. This includes specific

	  configurations for the board and its peripherals.

	  configurations for the board and its peripherals.





endif # ARCH_MX51



if ARCH_MX53_SUPPORTED

comment "i.MX53 machines:"

comment "i.MX53 machines:"





config MACH_MX53_EVK

config MACH_MX53_EVK
@@ -221,6 +213,4 @@ config MACH_MX53_ARD 
	  Include support for MX53 ARD platform. This includes specific

	  Include support for MX53 ARD platform. This includes specific

	  configurations for the board and its peripherals.

	  configurations for the board and its peripherals.





endif # ARCH_MX53_SUPPORTED



endif
 
endif

arch/arm/plat-mxc/Kconfig

+4 −16
Original line number Original line Diff line number Diff line
@@ -4,12 +4,6 @@ source "arch/arm/plat-mxc/devices/Kconfig" 




menu "Freescale MXC Implementations"

menu "Freescale MXC Implementations"





config ARCH_MX50_SUPPORTED

	bool



config ARCH_MX53_SUPPORTED

	bool



choice

choice

	prompt "Freescale CPU family:"

	prompt "Freescale CPU family:"

	default ARCH_MX3

	default ARCH_MX3
@@ -27,20 +21,14 @@ config ARCH_MX3 
	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 family





config ARCH_MX503

config ARCH_MX5

	bool "i.MX50 + i.MX53"

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

	select ARCH_MX50_SUPPORTED

	select AUTO_ZRELADDR

	select ARCH_MX53_SUPPORTED

	select ARM_PATCH_PHYS_VIRT

	help

	help

	  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_MX51

	bool "i.MX51"

	select ARCH_MX51_SUPPORTED

	help

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



endchoice

endchoice





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

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

arch/arm/plat-mxc/include/mach/memory.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -23,12 +23,6 @@ 
#if !defined(CONFIG_RUNTIME_PHYS_OFFSET)

#if !defined(CONFIG_RUNTIME_PHYS_OFFSET)

# if defined CONFIG_ARCH_MX3

# if defined CONFIG_ARCH_MX3

#  define PLAT_PHYS_OFFSET		MX3x_PHYS_OFFSET

#  define PLAT_PHYS_OFFSET		MX3x_PHYS_OFFSET

# elif defined CONFIG_ARCH_MX50

#  define PLAT_PHYS_OFFSET		MX50_PHYS_OFFSET

# elif defined CONFIG_ARCH_MX51

#  define PLAT_PHYS_OFFSET		MX51_PHYS_OFFSET

# elif defined CONFIG_ARCH_MX53

#  define PLAT_PHYS_OFFSET		MX53_PHYS_OFFSET

# endif

# endif

#endif

#endif