summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-04-25 06:29:47 +0200
committerLuka Perkov <luka.perkov@sartura.hr>2015-05-05 14:28:29 +0200
commit250eea74b98fb36c6bd7bebfa5ba9980b9347340 (patch)
treec6102e0c6b17302831d667d61b5ed1f99a655826 /arch/arm
parentd0787656405fc9a43f00715a0d05c2860cbe7b81 (diff)
downloadu-boot-imx-250eea74b98fb36c6bd7bebfa5ba9980b9347340.zip
u-boot-imx-250eea74b98fb36c6bd7bebfa5ba9980b9347340.tar.gz
u-boot-imx-250eea74b98fb36c6bd7bebfa5ba9980b9347340.tar.bz2
arm: mvebu: Change header macros from ARMADA_XP to MVEBU
Since these files will be used for other MVEBU SoC's, lets reflect this in the headers marcos as well. Signed-off-by: Stefan Roese <sr@denx.de> Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com> Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mvebu/include/mach/config.h6
-rw-r--r--arch/arm/mach-mvebu/include/mach/cpu.h6
-rw-r--r--arch/arm/mach-mvebu/include/mach/soc.h8
3 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index f9fd424..01b725b 100644
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
@@ -12,8 +12,8 @@
* It supports common definitions for Armada XP platforms
*/
-#ifndef _ARMADA_XP_CONFIG_H
-#define _ARMADA_XP_CONFIG_H
+#ifndef _MVEBU_CONFIG_H
+#define _MVEBU_CONFIG_H
#include <asm/arch/soc.h>
@@ -83,4 +83,4 @@
#define CONFIG_SYS_I2C_SPEED 100000
#endif
-#endif /* _ARMADA_XP_CONFIG_H */
+#endif /* __MVEBU_CONFIG_H */
diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h
index 4f5ff96..297ac52 100644
--- a/arch/arm/mach-mvebu/include/mach/cpu.h
+++ b/arch/arm/mach-mvebu/include/mach/cpu.h
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef _ARMADA_XP_CPU_H
-#define _ARMADA_XP_CPU_H
+#ifndef _MVEBU_CPU_H
+#define _MVEBU_CPU_H
#include <asm/system.h>
@@ -120,4 +120,4 @@ int serdes_phy_config(void);
*/
int ddr3_init(void);
#endif /* __ASSEMBLY__ */
-#endif /* _ARMADA_XP_CPU_H */
+#endif /* _MVEBU_CPU_H */
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
index 963e7ac..202d5b8 100644
--- a/arch/arm/mach-mvebu/include/mach/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h
@@ -8,8 +8,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef _ASM_ARCH_ARMADA_XP_H
-#define _ASM_ARCH_ARMADA_XP_H
+#ifndef _MVEBU_SOC_H
+#define _MVEBU_SOC_H
#define SOC_MV78460_ID 0x7846
@@ -49,9 +49,9 @@
/* Armada XP GbE controller has 4 ports */
#define MAX_MVNETA_DEVS 4
-/* Kirkwood CPU memory windows */
+/* MVEBU CPU memory windows */
#define MVCPU_WIN_CTRL_DATA CPU_WIN_CTRL_DATA
#define MVCPU_WIN_ENABLE CPU_WIN_ENABLE
#define MVCPU_WIN_DISABLE CPU_WIN_DISABLE
-#endif /* _ASM_ARCH_ARMADA_XP_H */
+#endif /* _MVEBU_SOC_H */