git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 50e177c)
ARM: imx5: drop option MACH_IMX51_DT
authorShawn Guo <shawn.guo@freescale.com>
Mon, 19 May 2014 05:47:43 +0000 (13:47 +0800)
committerShawn Guo <shawn.guo@freescale.com>
Fri, 18 Jul 2014 08:10:04 +0000 (16:10 +0800)
Since i.MX51 becomes DT only now, we can drop option MACH_IMX51_DT and
just use SOC_IMX51 instead.  While at it, rename imx51-dt.c to
mach-imx51.c to align with the name schema of other IMX DT only
platforms.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
arch/arm/configs/imx_v6_v7_defconfig patch | blob | history
arch/arm/configs/multi_v7_defconfig patch | blob | history
arch/arm/mach-imx/Kconfig patch | blob | history
arch/arm/mach-imx/Makefile patch | blob | history
arch/arm/mach-imx/mach-imx51.c [moved from arch/arm/mach-imx/imx51-dt.c with 100% similarity] patch | blob | history

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 59b7e45..188ea18 100644 (file)
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -31,7 +31,7 @@ CONFIG_MACH_IMX35_DT=y
 CONFIG_MACH_PCM043=y
 CONFIG_MACH_MX35_3DS=y
 CONFIG_MACH_VPR200=y
-CONFIG_MACH_IMX51_DT=y
+CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX50=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge
diff --cc arch/arm/mach-imx/Kconfig
Simple merge
diff --cc arch/arm/mach-imx/Makefile
Simple merge
diff --cc arch/arm/mach-imx/mach-imx51.c
Simple merge
Pandora Kernel Repository