diff options
| author | Stefan Roese <sr@denx.de> | 2014-10-22 12:13:05 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-23 09:58:41 -0400 |
| commit | d80cca29fe8876278e6e0c863c869a4cade7e8ad (patch) | |
| tree | 05ee6b4063409ebb71d4f7cbadd69cf1dd6f6ffd | |
| parent | dee8abcd80d0981f7a1c2bb5d1f2e9313fddf189 (diff) | |
| download | u-boot-d80cca29fe8876278e6e0c863c869a4cade7e8ad.tar.gz u-boot-d80cca29fe8876278e6e0c863c869a4cade7e8ad.tar.bz2 u-boot-d80cca29fe8876278e6e0c863c869a4cade7e8ad.zip | |
arm: kirkwood: Move some SoC files into new arch/arm/mvebu-common
By moving some kirkwood files into a Marvell common directory, those files
can be used by other Marvell platforms as well. The name mvebu is taken
from the Linux kernel source tree. It has been chosen there to represent
the SoC's from the Marvell EBU (Engineering Business Unit). Those SoC's
currently are:
Armada 370/375/XP, Dove, mv78xx0, Kirkwood, Orion5x
This will be used by the upcoming Armada XP (MV78460) platform support.
Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Luka Perkov <luka@openwrt.org>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/mvebu-common/Makefile | 10 | ||||
| -rw-r--r-- | arch/arm/mvebu-common/dram.c (renamed from arch/arm/cpu/arm926ejs/kirkwood/dram.c) | 8 | ||||
| -rw-r--r-- | arch/arm/mvebu-common/timer.c (renamed from arch/arm/cpu/arm926ejs/kirkwood/timer.c) | 0 |
5 files changed, 22 insertions, 4 deletions
@@ -652,6 +652,10 @@ ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs vf610)) libs-y += arch/$(ARCH)/imx-common/ endif +ifneq (,$(filter $(SOC), kirkwood)) +libs-y += arch/$(ARCH)/mvebu-common/ +endif + libs-$(CONFIG_ARM) += arch/arm/cpu/ libs-$(CONFIG_PPC) += arch/powerpc/cpu/ diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Makefile b/arch/arm/cpu/arm926ejs/kirkwood/Makefile index c230ce8994..df4756e4bd 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/Makefile +++ b/arch/arm/cpu/arm926ejs/kirkwood/Makefile @@ -7,7 +7,5 @@ # obj-y = cpu.o -obj-y += dram.o -obj-y += mpp.o -obj-y += timer.o obj-y += cache.o +obj-y += mpp.o diff --git a/arch/arm/mvebu-common/Makefile b/arch/arm/mvebu-common/Makefile new file mode 100644 index 0000000000..4d20d2ca53 --- /dev/null +++ b/arch/arm/mvebu-common/Makefile @@ -0,0 +1,10 @@ +# +# (C) Copyright 2009 +# Marvell Semiconductor <www.marvell.com> +# Written-by: Prafulla Wadaskar <prafulla@marvell.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y = dram.o +obj-y += timer.o diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/mvebu-common/dram.c index d73ae47c34..bb5989b3e8 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c +++ b/arch/arm/mvebu-common/dram.c @@ -110,7 +110,13 @@ int dram_init(void) if (gd->bd->bi_dram[i].start != gd->ram_size) break; - gd->ram_size += gd->bd->bi_dram[i].size; + /* + * Don't report more than 3GiB of SDRAM, otherwise there is no + * address space left for the internal registers etc. + */ + if ((gd->ram_size + gd->bd->bi_dram[i].size != 0) && + (gd->ram_size + gd->bd->bi_dram[i].size <= (3 << 30))) + gd->ram_size += gd->bd->bi_dram[i].size; } diff --git a/arch/arm/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/mvebu-common/timer.c index a08f4a1456..a08f4a1456 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/timer.c +++ b/arch/arm/mvebu-common/timer.c |