git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
Makefile.boot
diff --git
a/arch/arm/mach-at91/Makefile.boot
b/arch/arm/mach-at91/Makefile.boot
index
3462b81
..
9ab5a3e
100644
(file)
--- a/
arch/arm/mach-at91/Makefile.boot
+++ b/
arch/arm/mach-at91/Makefile.boot
@@
-4,15
+4,15
@@
# INITRD_PHYS must be in RAM
ifeq ($(CONFIG_ARCH_AT91CAP9),y)
# INITRD_PHYS must be in RAM
ifeq ($(CONFIG_ARCH_AT91CAP9),y)
- zreladdr-y
:
= 0x70008000
+ zreladdr-y
+
= 0x70008000
params_phys-y := 0x70000100
initrd_phys-y := 0x70410000
else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y)
params_phys-y := 0x70000100
initrd_phys-y := 0x70410000
else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y)
- zreladdr-y
:
= 0x70008000
+ zreladdr-y
+
= 0x70008000
params_phys-y := 0x70000100
initrd_phys-y := 0x70410000
else
params_phys-y := 0x70000100
initrd_phys-y := 0x70410000
else
- zreladdr-y
:
= 0x20008000
+ zreladdr-y
+
= 0x20008000
params_phys-y := 0x20000100
initrd_phys-y := 0x20410000
endif
params_phys-y := 0x20000100
initrd_phys-y := 0x20410000
endif