1 files changed, 19 insertions, 15 deletions
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot
index 22d85889f622..cfede5768aa0 100644
--- a/arch/arm/mach-imx/Makefile.boot
+++ b/arch/arm/mach-imx/Makefile.boot
@@ -1,22 +1,26 @@
-zreladdr-$(CONFIG_ARCH_MX1)     += 0x08008000
+zreladdr-$(CONFIG_SOC_IMX1)     += 0x08008000
-params_phys-$(CONFIG_ARCH_MX1)  := 0x08000100
+params_phys-$(CONFIG_SOC_IMX1)  := 0x08000100
-initrd_phys-$(CONFIG_ARCH_MX1)  := 0x08800000
+initrd_phys-$(CONFIG_SOC_IMX1)  := 0x08800000
-zreladdr-$(CONFIG_MACH_MX21)    += 0xC0008000
+zreladdr-$(CONFIG_SOC_IMX21)    += 0xC0008000
-params_phys-$(CONFIG_MACH_MX21) := 0xC0000100
+params_phys-$(CONFIG_SOC_IMX21) := 0xC0000100
-initrd_phys-$(CONFIG_MACH_MX21) := 0xC0800000
+initrd_phys-$(CONFIG_SOC_IMX21) := 0xC0800000
-zreladdr-$(CONFIG_ARCH_MX25)    += 0x80008000
+zreladdr-$(CONFIG_SOC_IMX25)    += 0x80008000
-params_phys-$(CONFIG_ARCH_MX25) := 0x80000100
+params_phys-$(CONFIG_SOC_IMX25) := 0x80000100
-initrd_phys-$(CONFIG_ARCH_MX25) := 0x80800000
+initrd_phys-$(CONFIG_SOC_IMX25) := 0x80800000
-zreladdr-$(CONFIG_MACH_MX27)    += 0xA0008000
+zreladdr-$(CONFIG_SOC_IMX27)    += 0xA0008000
-params_phys-$(CONFIG_MACH_MX27) := 0xA0000100
+params_phys-$(CONFIG_SOC_IMX27) := 0xA0000100
-initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000
+initrd_phys-$(CONFIG_SOC_IMX27) := 0xA0800000
-zreladdr-$(CONFIG_ARCH_MX3)     += 0x80008000
+zreladdr-$(CONFIG_SOC_IMX31)    += 0x80008000
-params_phys-$(CONFIG_ARCH_MX3)  := 0x80000100
+params_phys-$(CONFIG_SOC_IMX31) := 0x80000100
-initrd_phys-$(CONFIG_ARCH_MX3)  := 0x80800000
+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_IMX6Q)    += 0x10008000
 params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100

diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot index 22d85889f622..cfede5768aa0 100644 --- a/arch/arm/mach-imx/Makefile.boot +++ b/arch/arm/mach-imx/Makefile.boot
@@ -1,22 +1,26 @@
1	zreladdr-$(CONFIG_ARCH_MX1) += 0x08008000	1	zreladdr-$(CONFIG_SOC_IMX1) += 0x08008000
2	params_phys-$(CONFIG_ARCH_MX1) := 0x08000100	2	params_phys-$(CONFIG_SOC_IMX1) := 0x08000100
3	initrd_phys-$(CONFIG_ARCH_MX1) := 0x08800000	3	initrd_phys-$(CONFIG_SOC_IMX1) := 0x08800000
4		4
5	zreladdr-$(CONFIG_MACH_MX21) += 0xC0008000	5	zreladdr-$(CONFIG_SOC_IMX21) += 0xC0008000
6	params_phys-$(CONFIG_MACH_MX21) := 0xC0000100	6	params_phys-$(CONFIG_SOC_IMX21) := 0xC0000100
7	initrd_phys-$(CONFIG_MACH_MX21) := 0xC0800000	7	initrd_phys-$(CONFIG_SOC_IMX21) := 0xC0800000
8		8
9	zreladdr-$(CONFIG_ARCH_MX25) += 0x80008000	9	zreladdr-$(CONFIG_SOC_IMX25) += 0x80008000
10	params_phys-$(CONFIG_ARCH_MX25) := 0x80000100	10	params_phys-$(CONFIG_SOC_IMX25) := 0x80000100
11	initrd_phys-$(CONFIG_ARCH_MX25) := 0x80800000	11	initrd_phys-$(CONFIG_SOC_IMX25) := 0x80800000
12		12
13	zreladdr-$(CONFIG_MACH_MX27) += 0xA0008000	13	zreladdr-$(CONFIG_SOC_IMX27) += 0xA0008000
14	params_phys-$(CONFIG_MACH_MX27) := 0xA0000100	14	params_phys-$(CONFIG_SOC_IMX27) := 0xA0000100
15	initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000	15	initrd_phys-$(CONFIG_SOC_IMX27) := 0xA0800000
16		16
17	zreladdr-$(CONFIG_ARCH_MX3) += 0x80008000	17	zreladdr-$(CONFIG_SOC_IMX31) += 0x80008000
18	params_phys-$(CONFIG_ARCH_MX3) := 0x80000100	18	params_phys-$(CONFIG_SOC_IMX31) := 0x80000100
19	initrd_phys-$(CONFIG_ARCH_MX3) := 0x80800000	19	initrd_phys-$(CONFIG_SOC_IMX31) := 0x80800000
		20
		21	zreladdr-$(CONFIG_SOC_IMX35) += 0x80008000
		22	params_phys-$(CONFIG_SOC_IMX35) := 0x80000100
		23	initrd_phys-$(CONFIG_SOC_IMX35) := 0x80800000
20		24
21	zreladdr-$(CONFIG_SOC_IMX6Q) += 0x10008000	25	zreladdr-$(CONFIG_SOC_IMX6Q) += 0x10008000
22	params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100	26	params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100