mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 21:02:19 +00:00
994c0e9925
* 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits) MAINTAINERS: add ARM/FREESCALE IMX6 entry arm/imx: merge i.MX3 and i.MX6 arm/imx6q: add suspend/resume support arm/imx6q: add device tree machine support arm/imx6q: add smp and cpu hotplug support arm/imx6q: add core drivers clock, gpc, mmdc and src arm/imx: add gic_handle_irq function arm/imx6q: add core definitions and low-level debug uart arm/imx6q: add device tree source ARM: highbank: add suspend support ARM: highbank: Add cpu hotplug support ARM: highbank: add SMP support MAINTAINERS: add Calxeda Highbank ARM platform ARM: add Highbank core platform support ARM: highbank: add devicetree source ARM: l2x0: add empty l2x0_of_init picoxcell: add a definition of VMALLOC_END picoxcell: remove custom ioremap implementation picoxcell: add the DTS for the PC7302 board picoxcell: add the DTS for pc3x2 and pc3x3 devices ... Fix up trivial conflicts in arch/arm/Kconfig, and some more header file conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge by Arnd).
24 lines
809 B
Clojure
24 lines
809 B
Clojure
zreladdr-$(CONFIG_ARCH_MX1) += 0x08008000
|
|
params_phys-$(CONFIG_ARCH_MX1) := 0x08000100
|
|
initrd_phys-$(CONFIG_ARCH_MX1) := 0x08800000
|
|
|
|
zreladdr-$(CONFIG_MACH_MX21) += 0xC0008000
|
|
params_phys-$(CONFIG_MACH_MX21) := 0xC0000100
|
|
initrd_phys-$(CONFIG_MACH_MX21) := 0xC0800000
|
|
|
|
zreladdr-$(CONFIG_ARCH_MX25) += 0x80008000
|
|
params_phys-$(CONFIG_ARCH_MX25) := 0x80000100
|
|
initrd_phys-$(CONFIG_ARCH_MX25) := 0x80800000
|
|
|
|
zreladdr-$(CONFIG_MACH_MX27) += 0xA0008000
|
|
params_phys-$(CONFIG_MACH_MX27) := 0xA0000100
|
|
initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000
|
|
|
|
zreladdr-$(CONFIG_ARCH_MX3) += 0x80008000
|
|
params_phys-$(CONFIG_ARCH_MX3) := 0x80000100
|
|
initrd_phys-$(CONFIG_ARCH_MX3) := 0x80800000
|
|
|
|
zreladdr-$(CONFIG_SOC_IMX6Q) += 0x10008000
|
|
params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100
|
|
initrd_phys-$(CONFIG_SOC_IMX6Q) := 0x10800000
|