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>
master
Stefan Roese 9 years ago committed by Luka Perkov
parent d078765640
commit 250eea74b9
  1. 6
      arch/arm/mach-mvebu/include/mach/config.h
  2. 6
      arch/arm/mach-mvebu/include/mach/cpu.h
  3. 8
      arch/arm/mach-mvebu/include/mach/soc.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 */

@ -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 */

@ -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 */

Loading…
Cancel
Save