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

Commit c23eb89e authored by Richard Zhao's avatar Richard Zhao Committed by Sascha Hauer
Browse files

ARM: imx3x: clean up ARCH_MX3X 



Move to SOC_SOC_IMX3X.
Leave ARCH_MX31/35 definitions there, in case some place prevent multi-soc
single image.

Signed-off-by: default avatarRichard Zhao <richard.zhao@freescale.com>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 76851671

arch/arm/mm/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -811,7 +811,7 @@ 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 || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \

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

		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \

		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \

		   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE

		   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE

	default y

	default y

arch/arm/plat-mxc/devices/platform-imx-dma.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ static struct sdma_script_start_addrs addr_imx25_to1 = { 
};

};

#endif

#endif





#ifdef CONFIG_ARCH_MX31

#ifdef CONFIG_SOC_IMX31

static struct sdma_script_start_addrs addr_imx31_to1 = {

static struct sdma_script_start_addrs addr_imx31_to1 = {

	.per_2_per_addr = 1677,

	.per_2_per_addr = 1677,

};

};
@@ -106,7 +106,7 @@ static struct sdma_script_start_addrs addr_imx31_to2 = { 
};

};

#endif

#endif





#ifdef CONFIG_ARCH_MX35

#ifdef CONFIG_SOC_IMX35

static struct sdma_script_start_addrs addr_imx35_to1 = {

static struct sdma_script_start_addrs addr_imx35_to1 = {

	.ap_2_ap_addr = 642,

	.ap_2_ap_addr = 642,

	.uart_2_mcu_addr = 817,

	.uart_2_mcu_addr = 817,

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ extern unsigned int __mxc_cpu_type; 
# define cpu_is_mx27()		(0)

# define cpu_is_mx27()		(0)

#endif

#endif





#ifdef CONFIG_ARCH_MX31

#ifdef CONFIG_SOC_IMX31

# ifdef mxc_cpu_type

# ifdef mxc_cpu_type

#  undef mxc_cpu_type

#  undef mxc_cpu_type

#  define mxc_cpu_type __mxc_cpu_type

#  define mxc_cpu_type __mxc_cpu_type
@@ -115,7 +115,7 @@ extern unsigned int __mxc_cpu_type; 
# define cpu_is_mx31()		(0)

# define cpu_is_mx31()		(0)

#endif

#endif





#ifdef CONFIG_ARCH_MX35

#ifdef CONFIG_SOC_IMX35

# ifdef mxc_cpu_type

# ifdef mxc_cpu_type

#  undef mxc_cpu_type

#  undef mxc_cpu_type

#  define mxc_cpu_type __mxc_cpu_type

#  define mxc_cpu_type __mxc_cpu_type

drivers/net/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -1944,7 +1944,7 @@ config 68360_ENET 
config FEC

config FEC

	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"

	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"

	depends on M523x || M527x || M5272 || M528x || M520x || M532x || \

	depends on M523x || M527x || M5272 || M528x || M520x || M532x || \

		MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28

		IMX_HAVE_PLATFORM_FEC || SOC_IMX28

	select PHYLIB

	select PHYLIB

	help

	help

	  Say Y here if you want to use the built-in 10/100 Fast ethernet

	  Say Y here if you want to use the built-in 10/100 Fast ethernet

drivers/spi/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -161,10 +161,10 @@ config SPI_IMX_VER_0_0 
	def_bool y if SOC_IMX21 || SOC_IMX27

	def_bool y if SOC_IMX21 || SOC_IMX27





config SPI_IMX_VER_0_4

config SPI_IMX_VER_0_4

	def_bool y if ARCH_MX31

	def_bool y if SOC_MX31





config SPI_IMX_VER_0_7

config SPI_IMX_VER_0_7

	def_bool y if ARCH_MX25 || ARCH_MX35 || SOC_IMX51 || SOC_IMX53

	def_bool y if ARCH_MX25 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53





config SPI_IMX_VER_2_3

config SPI_IMX_VER_2_3

	def_bool y if SOC_IMX51 || SOC_IMX53

	def_bool y if SOC_IMX51 || SOC_IMX53