diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-08-09 21:03:43 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2011-08-17 10:20:29 +0200 |
| commit | 73285146544589424e8e1c1ebd6304d3c6231acf (patch) | |
| tree | bf708ce0fad584054e6904219e58c833d02f72d0 /arch/arm/mach-u300/Makefile.boot | |
| parent | Linux 3.1-rc2 (diff) | |
| download | linux-73285146544589424e8e1c1ebd6304d3c6231acf.tar.xz linux-73285146544589424e8e1c1ebd6304d3c6231acf.zip | |
mach-u300: retire odd singlemem variant
The U300 had a special variant where a memory was shared
between two CPU:s and only one part of memory was
accessible for the kernel. However it is now seriously
legacy and only create problems for kernel consolidation,
so let's retire it.
Cc: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-u300/Makefile.boot | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/arm/mach-u300/Makefile.boot b/arch/arm/mach-u300/Makefile.boot index 6fbfc6ea2d35..a06bb0deadfe 100644 --- a/arch/arm/mach-u300/Makefile.boot +++ b/arch/arm/mach-u300/Makefile.boot @@ -1,15 +1,4 @@ -# 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 - + zreladdr-y := 0x48008000 +params_phys-y := 0x48000100 # This isn't used. -#initrd_phys-y := 0x29800000 +#initrd_phys-y := 0x48800000 |