summaryrefslogtreecommitdiffstats
path: root/arch/arm/mvebu-common
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2014-10-22 12:13:06 +0200
committerTom Rini <trini@ti.com>2014-10-23 09:59:20 -0400
commit3dc23f7852158fafde9eb736060f9e8131997f19 (patch)
tree9304c712d44d32354ff17f1729948d4125ec317b /arch/arm/mvebu-common
parentd80cca29fe8876278e6e0c863c869a4cade7e8ad (diff)
downloadblackbird-obmc-uboot-3dc23f7852158fafde9eb736060f9e8131997f19.tar.gz
blackbird-obmc-uboot-3dc23f7852158fafde9eb736060f9e8131997f19.zip
arm: marvell: Move arch/kirkwood.h to arch/soc.h
This move makes is possible to use this header not only from kirkwood platforms but from all Marvell mvebu platforms. Signed-off-by: Stefan Roese <sr@denx.de> Tested-by: Luka Perkov <luka@openwrt.org> Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Diffstat (limited to 'arch/arm/mvebu-common')
-rw-r--r--arch/arm/mvebu-common/dram.c2
-rw-r--r--arch/arm/mvebu-common/timer.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mvebu-common/dram.c b/arch/arm/mvebu-common/dram.c
index bb5989b3e8..e468136eb9 100644
--- a/arch/arm/mvebu-common/dram.c
+++ b/arch/arm/mvebu-common/dram.c
@@ -10,7 +10,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
-#include <asm/arch/kirkwood.h>
+#include <asm/arch/soc.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mvebu-common/timer.c b/arch/arm/mvebu-common/timer.c
index a08f4a1456..b7aa6458d7 100644
--- a/arch/arm/mvebu-common/timer.c
+++ b/arch/arm/mvebu-common/timer.c
@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
-#include <asm/arch/kirkwood.h>
+#include <asm/arch/soc.h>
#define UBOOT_CNTR 0 /* counter to use for uboot timer */
OpenPOWER on IntegriCloud