summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm
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/include/asm
parentd80cca29fe8876278e6e0c863c869a4cade7e8ad (diff)
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/include/asm')
-rw-r--r--arch/arm/include/asm/arch-kirkwood/config.h2
-rw-r--r--arch/arm/include/asm/arch-kirkwood/soc.h (renamed from arch/arm/include/asm/arch-kirkwood/kirkwood.h)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h
index f7bfa0e74d..ccc8e4e7d6 100644
--- a/arch/arm/include/asm/arch-kirkwood/config.h
+++ b/arch/arm/include/asm/arch-kirkwood/config.h
@@ -23,7 +23,7 @@
#error "SOC Name not defined"
#endif /* CONFIG_KW88F6281 */
-#include <asm/arch/kirkwood.h>
+#include <asm/arch/soc.h>
#define CONFIG_ARM926EJS 1 /* Basic Architecture */
#define CONFIG_SYS_CACHELINE_SIZE 32
/* default Dcache Line length for kirkwood */
diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/soc.h
index 3ea51d7848..3ea51d7848 100644
--- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h
+++ b/arch/arm/include/asm/arch-kirkwood/soc.h