author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 23 Jan 2012 22:50:30 +0000 (14:50 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 23 Jan 2012 22:50:30 +0000 (14:50 -0800) |
Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.
* tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM i.MX: Update defconfig
ARM i.MX: Merge i.MX5 support into mach-imx
ARM i.MX5: remove unnecessary includes from board files
Fix up fairly trivial conflicts due to various changes nearby in
arch/arm/{mach,plat}-imx/{Kconfig,Makefile}
Pull request had been sent to the wrong email address, but happened
before the merge window closed. I'm merging the MX 5 consolidation,
since it apparently will help the next development window and will avoid
conflicts later as per Arnd.
* tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM i.MX: Update defconfig
ARM i.MX: Merge i.MX5 support into mach-imx
ARM i.MX5: remove unnecessary includes from board files
Fix up fairly trivial conflicts due to various changes nearby in
arch/arm/{mach,plat}-imx/{Kconfig,Makefile}
Pull request had been sent to the wrong email address, but happened
before the merge window closed. I'm merging the MX 5 consolidation,
since it apparently will help the next development window and will avoid
conflicts later as per Arnd.
22 files changed:
diff --cc arch/arm/Makefile
Simple merge
diff --cc arch/arm/mach-imx/Kconfig
index 0e6de366c6482026157656ad3ea9f8866299ba50,ef6a6b8f01cae9b94cf3e03b600ed26b0950d394..09f357bcecdee373fc32c3cb47ff7b82bc5e0cf5
config MACH_MX27
bool
-config ARCH_MX31
- bool
-
-config ARCH_MX35
- bool
-
+ config ARCH_MX5
+ bool
+
+ config ARCH_MX50
+ bool
+
+ config ARCH_MX51
+ bool
+
+ config ARCH_MX53
+ bool
+
config SOC_IMX1
bool
select ARCH_MX1
diff --cc arch/arm/mach-imx/Makefile
index f5920c24f7d7eab486a8a340e4e6b6b785038483,9cf630a341e18bd9579686ae80af497c558f2df9..55db9c488f2b408162e4bcca36f44d7cdb444ac0
obj-$(CONFIG_SMP) += platsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
-obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o pm-imx6q.o
+obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o
+
+ifeq ($(CONFIG_PM),y)
+obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o
+endif
+
+ # i.MX5 based machines
+ obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
+ obj-$(CONFIG_MACH_MX51_3DS) += mach-mx51_3ds.o
+ obj-$(CONFIG_MACH_MX53_EVK) += mach-mx53_evk.o
+ obj-$(CONFIG_MACH_MX53_SMD) += mach-mx53_smd.o
+ obj-$(CONFIG_MACH_MX53_LOCO) += mach-mx53_loco.o
+ obj-$(CONFIG_MACH_MX53_ARD) += mach-mx53_ard.o
+ obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += mach-cpuimx51.o
+ obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
+ obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o
+ obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd-baseboard.o
+ obj-$(CONFIG_MX51_EFIKA_COMMON) += mx51_efika.o
+ obj-$(CONFIG_MACH_MX51_EFIKAMX) += mach-mx51_efikamx.o
+ obj-$(CONFIG_MACH_MX51_EFIKASB) += mach-mx51_efikasb.o
+ obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o
+
+ obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o
+ obj-$(CONFIG_MACH_IMX53_DT) += imx53-dt.o
diff --cc arch/arm/mach-imx/Makefile.boot
index 5f4d06af491262a6ac6d75d7bcdeaee74684a16b,2c12b7889e97acc44b6af29771362972d355ef6f..6dfdbcc83afd7d4fb9e8245dfceed489e0c6970e
-zreladdr-$(CONFIG_ARCH_MX1) += 0x08008000
-params_phys-$(CONFIG_ARCH_MX1) := 0x08000100
-initrd_phys-$(CONFIG_ARCH_MX1) := 0x08800000
+zreladdr-$(CONFIG_SOC_IMX1) += 0x08008000
+params_phys-$(CONFIG_SOC_IMX1) := 0x08000100
+initrd_phys-$(CONFIG_SOC_IMX1) := 0x08800000
-zreladdr-$(CONFIG_MACH_MX21) += 0xC0008000
-params_phys-$(CONFIG_MACH_MX21) := 0xC0000100
-initrd_phys-$(CONFIG_MACH_MX21) := 0xC0800000
+zreladdr-$(CONFIG_SOC_IMX21) += 0xC0008000
+params_phys-$(CONFIG_SOC_IMX21) := 0xC0000100
+initrd_phys-$(CONFIG_SOC_IMX21) := 0xC0800000
-zreladdr-$(CONFIG_ARCH_MX25) += 0x80008000
-params_phys-$(CONFIG_ARCH_MX25) := 0x80000100
-initrd_phys-$(CONFIG_ARCH_MX25) := 0x80800000
+zreladdr-$(CONFIG_SOC_IMX25) += 0x80008000
+params_phys-$(CONFIG_SOC_IMX25) := 0x80000100
+initrd_phys-$(CONFIG_SOC_IMX25) := 0x80800000
-zreladdr-$(CONFIG_MACH_MX27) += 0xA0008000
-params_phys-$(CONFIG_MACH_MX27) := 0xA0000100
-initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000
+zreladdr-$(CONFIG_SOC_IMX27) += 0xA0008000
+params_phys-$(CONFIG_SOC_IMX27) := 0xA0000100
+initrd_phys-$(CONFIG_SOC_IMX27) := 0xA0800000
-zreladdr-$(CONFIG_ARCH_MX3) += 0x80008000
-params_phys-$(CONFIG_ARCH_MX3) := 0x80000100
-initrd_phys-$(CONFIG_ARCH_MX3) := 0x80800000
+zreladdr-$(CONFIG_SOC_IMX31) += 0x80008000
+params_phys-$(CONFIG_SOC_IMX31) := 0x80000100
+initrd_phys-$(CONFIG_SOC_IMX31) := 0x80800000
+
+zreladdr-$(CONFIG_SOC_IMX35) += 0x80008000
+params_phys-$(CONFIG_SOC_IMX35) := 0x80000100
+initrd_phys-$(CONFIG_SOC_IMX35) := 0x80800000
+ zreladdr-$(CONFIG_SOC_IMX50) += 0x70008000
+ params_phys-$(CONFIG_SOC_IMX50) := 0x70000100
+ initrd_phys-$(CONFIG_SOC_IMX50) := 0x70800000
+
+ zreladdr-$(CONFIG_SOC_IMX51) += 0x90008000
+ params_phys-$(CONFIG_SOC_IMX51) := 0x90000100
+ initrd_phys-$(CONFIG_SOC_IMX51) := 0x90800000
+
+ zreladdr-$(CONFIG_SOC_IMX53) += 0x70008000
+ params_phys-$(CONFIG_SOC_IMX53) := 0x70000100
+ initrd_phys-$(CONFIG_SOC_IMX53) := 0x70800000
+
zreladdr-$(CONFIG_SOC_IMX6Q) += 0x10008000
params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100
initrd_phys-$(CONFIG_SOC_IMX6Q) := 0x10800000
diff --cc arch/arm/mach-imx/clock-mx51-mx53.c
Simple merge
diff --cc arch/arm/mach-imx/cpu-imx5.c
Simple merge
diff --cc arch/arm/mach-imx/imx51-dt.c
Simple merge
diff --cc arch/arm/mach-imx/imx53-dt.c
Simple merge
diff --cc arch/arm/mach-imx/mach-cpuimx51.c
Simple merge
diff --cc arch/arm/mach-imx/mach-cpuimx51sd.c
Simple merge
diff --cc arch/arm/mach-imx/mach-mx50_rdp.c
Simple merge
diff --cc arch/arm/mach-imx/mach-mx51_3ds.c
Simple merge
diff --cc arch/arm/mach-imx/mach-mx51_babbage.c
Simple merge
diff --cc arch/arm/mach-imx/mach-mx51_efikamx.c
Simple merge
diff --cc arch/arm/mach-imx/mach-mx51_efikasb.c
Simple merge
diff --cc arch/arm/mach-imx/mach-mx53_ard.c
Simple merge
diff --cc arch/arm/mach-imx/mach-mx53_evk.c
Simple merge
diff --cc arch/arm/mach-imx/mach-mx53_loco.c
Simple merge
diff --cc arch/arm/mach-imx/mach-mx53_smd.c
Simple merge
diff --cc arch/arm/mach-imx/mm-imx5.c
Simple merge
diff --cc arch/arm/mach-imx/pm-imx5.c
Simple merge
diff --cc arch/arm/plat-mxc/Kconfig
index b30708e28c1de1560fb886e30b35d305fb25738d,fdde4d13d2e8bc7c520fdb1f7c62fd5d451ac891..dcebb1230f7fd3cd6f6e492c97507a483dcef3b8
and ARMv5 SoCs
config ARCH_IMX_V6_V7
- bool "i.MX3, i.MX6"
+ bool "i.MX3, i.MX5, i.MX6"
select AUTO_ZRELADDR if !ZBOOT_ROM
select ARM_PATCH_PHYS_VIRT
+ select MIGHT_HAVE_CACHE_L2X0
help
- This enables support for systems based on the Freescale i.MX3 and i.MX6
- family.
-
- config ARCH_MX5
- bool "i.MX50, i.MX51, i.MX53"
- select AUTO_ZRELADDR if !ZBOOT_ROM
- select ARM_PATCH_PHYS_VIRT
- help
- This enables support for machines using Freescale's i.MX50 and i.MX53
- processors.
+ This enables support for systems based on the Freescale i.MX3, i.MX5
+ and i.MX6 family.
endchoice