mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 09:02:00 +00:00
367069f16e
* 'next/dt' of git://git.linaro.org/people/arnd/arm-soc:
ARM: gic: use module.h instead of export.h
ARM: gic: fix irq_alloc_descs handling for sparse irq
ARM: gic: add OF based initialization
ARM: gic: add irq_domain support
irq: support domains with non-zero hwirq base
of/irq: introduce of_irq_init
ARM: at91: add at91sam9g20 and Calao USB A9G20 DT support
ARM: at91: dt: at91sam9g45 family and board device tree files
arm/mx5: add device tree support for imx51 babbage
arm/mx5: add device tree support for imx53 boards
ARM: msm: Add devicetree support for msm8660-surf
msm_serial: Add devicetree support
msm_serial: Use relative resources for iomem
Fix up conflicts in arch/arm/mach-at91/{at91sam9260.c,at91sam9g45.c}
21 lines
578 B
Clojure
21 lines
578 B
Clojure
# Note: the following conditions must always be true:
|
|
# ZRELADDR == virt_to_phys(TEXTADDR)
|
|
# PARAMS_PHYS must be within 4MB of ZRELADDR
|
|
# INITRD_PHYS must be in RAM
|
|
|
|
ifeq ($(CONFIG_ARCH_AT91CAP9),y)
|
|
zreladdr-y += 0x70008000
|
|
params_phys-y := 0x70000100
|
|
initrd_phys-y := 0x70410000
|
|
else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y)
|
|
zreladdr-y += 0x70008000
|
|
params_phys-y := 0x70000100
|
|
initrd_phys-y := 0x70410000
|
|
else
|
|
zreladdr-y += 0x20008000
|
|
params_phys-y := 0x20000100
|
|
initrd_phys-y := 0x20410000
|
|
endif
|
|
|
|
dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9m10g45ek.dtb usb_a9g20.dtb
|