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 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-realview
/
Makefile.boot
diff --git
a/arch/arm/mach-realview/Makefile.boot
b/arch/arm/mach-realview/Makefile.boot
index
c7e75ac
..
d2c3d78
100644
(file)
--- a/
arch/arm/mach-realview/Makefile.boot
+++ b/
arch/arm/mach-realview/Makefile.boot
@@
-1,4
+1,9
@@
- zreladdr-y := 0x00008000
+ifeq ($(CONFIG_REALVIEW_HIGH_PHYS_OFFSET),y)
+ zreladdr-y += 0x70008000
+params_phys-y := 0x70000100
+initrd_phys-y := 0x70800000
+else
+ zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000
-
+endif