diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 12:01:44 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 12:01:44 +0200 |
commit | b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc (patch) | |
tree | c65b81ef9ae5076d2137034accfa2610f45a13de /arch/arm/mach-u300/Makefile.boot | |
parent | Merge branch 'stmp' into devel (diff) | |
parent | [ARM] 5535/1: U300 Makefile.boot (diff) | |
download | linux-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.tar.xz linux-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.zip |
Merge branch 'u300' into devel
Conflicts:
arch/arm/Makefile
Updates:
arch/arm/mach-u300/core.c
arch/arm/mach-u300/timer.c
Diffstat (limited to 'arch/arm/mach-u300/Makefile.boot')
-rw-r--r-- | arch/arm/mach-u300/Makefile.boot | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-u300/Makefile.boot b/arch/arm/mach-u300/Makefile.boot new file mode 100644 index 000000000000..6fbfc6ea2d35 --- /dev/null +++ b/arch/arm/mach-u300/Makefile.boot @@ -0,0 +1,15 @@ +# 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 + +ifdef CONFIG_MACH_U300_SINGLE_RAM + zreladdr-y := 0x28E08000 + params_phys-y := 0x28E00100 +else + zreladdr-y := 0x48008000 + params_phys-y := 0x48000100 +endif + +# This isn't used. +#initrd_phys-y := 0x29800000 |