mirror of
https://github.com/torvalds/linux.git
synced 2024-11-02 02:01:29 +00:00
eaed435a7b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPFmj/AAoJEIwa5zzehBx3utoP/2JKstlluwVdoIjzLDwJIZWS
BiFO90iC6knKHb3c4ZXBNtD4yz8ImFGr2v3IY4pR+feECu+zS/AYeynrr4AjlaRj
2wHI3/Cl2VktlzUR0k1KqfNrt1HLpZ8myxJ/pKchU8+KnxeQwCdV7MzkxocO0Abs
BQFhXj2WuS6b+H3kObrTy7n3tIyVeGUOW/bPU9TfWeRYEWBpGlqtPOH6A2cGi5e3
Iu9d9MPAiMt33+e7wZdmVHFky+ueqqeKevev+Vt8/JSJbPO7EseS/sbTOZH7Q1Yc
BWe5iARFpV9viJJMlwlO+wJ08BrqzCZ6M/mBITMAZ+a/EMYRn0TwibsWDw1GcAsA
H04Z1TW7pjni7SNFJavW3YWIR3TAKDZqwWbekGl2RzYqKmer1Hk6gwHAhxDQlMGY
2S7dSnw97zRA0WxW6kMPw5VY9VpDD1qjW+29UpEEePfAVhKkwE+lKYlX4k/l0ElC
9iYNoMVlhS4d5A7ZvhNU28XyGoxzAPNA4nC5OMUARZN++oSURDJ1kGNc73WQ8IbG
x+zZ7AFvt7y8OgZqG4bE+SeiHlYVAjtyV08WLxtDx4vTyNYuiWIXguf2hLJWEJPY
sqPGFHrMeh9YvYOXaa+DFb0fPkBJVJt663FPZ4TG2UBlphi26Ax5FtcnSBBvY4QV
CCen+xhdxX/dp83A/A0k
=ZgSs
-----END PGP SIGNATURE-----
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
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.
43 lines
1.4 KiB
Clojure
43 lines
1.4 KiB
Clojure
zreladdr-$(CONFIG_SOC_IMX1) += 0x08008000
|
|
params_phys-$(CONFIG_SOC_IMX1) := 0x08000100
|
|
initrd_phys-$(CONFIG_SOC_IMX1) := 0x08800000
|
|
|
|
zreladdr-$(CONFIG_SOC_IMX21) += 0xC0008000
|
|
params_phys-$(CONFIG_SOC_IMX21) := 0xC0000100
|
|
initrd_phys-$(CONFIG_SOC_IMX21) := 0xC0800000
|
|
|
|
zreladdr-$(CONFIG_SOC_IMX25) += 0x80008000
|
|
params_phys-$(CONFIG_SOC_IMX25) := 0x80000100
|
|
initrd_phys-$(CONFIG_SOC_IMX25) := 0x80800000
|
|
|
|
zreladdr-$(CONFIG_SOC_IMX27) += 0xA0008000
|
|
params_phys-$(CONFIG_SOC_IMX27) := 0xA0000100
|
|
initrd_phys-$(CONFIG_SOC_IMX27) := 0xA0800000
|
|
|
|
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
|
|
|
|
dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \
|
|
imx6q-sabrelite.dtb
|