All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 04/13] arm: mvebu: Change header macros from ARMADA_XP to MVEBU
Date: Tue, 14 Apr 2015 12:46:46 +0200	[thread overview]
Message-ID: <1429008415-27458-5-git-send-email-sr@denx.de> (raw)
In-Reply-To: <1429008415-27458-1-git-send-email-sr@denx.de>

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>
---

Changes in v2: None

 arch/arm/mach-mvebu/include/mach/config.h | 6 +++---
 arch/arm/mach-mvebu/include/mach/cpu.h    | 6 +++---
 arch/arm/mach-mvebu/include/mach/soc.h    | 8 ++++----
 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 */
-- 
2.3.5

  parent reply	other threads:[~2015-04-14 10:46 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-14 10:46 [U-Boot] [PATCH v2 0/13] Add Marvell Armada A38x 88F6820 SoC support Stefan Roese
2015-04-14 10:46 ` [U-Boot] [PATCH v2 01/13] arm: armada-xp: Move SoC sources to mach-mvebu Stefan Roese
2015-04-14 10:46 ` [U-Boot] [PATCH v2 02/13] arm: armada-xp: Move SoC headers to mach-mvebu/include/mach Stefan Roese
2015-04-14 10:46 ` [U-Boot] [PATCH v2 03/13] arm: mvebu: Move mvebu-common into mach-mvebu Stefan Roese
2015-04-14 10:46 ` Stefan Roese [this message]
2015-04-14 10:46 ` [U-Boot] [PATCH v2 05/13] arm: mvebu: Remove unreferenced define Stefan Roese
2015-04-14 10:46 ` [U-Boot] [PATCH v2 06/13] arm: mvebu: Only define MV88F78X60 for Armada XP Stefan Roese
2015-04-14 10:46 ` [U-Boot] [PATCH v2 07/13] arm: mvebu: Move CONFIG_SPL_LDSCRIPT to common header Stefan Roese
2015-04-14 10:46 ` [U-Boot] [PATCH v2 08/13] arm: mvebu: Add basic Armada 38x support Stefan Roese
2015-04-14 10:46 ` [U-Boot] [PATCH v2 09/13] arm: mvebu: Change network init code to allow a more flexible setup Stefan Roese
2015-04-14 10:46 ` [U-Boot] [PATCH v2 10/13] arm: mvebu: Add dynamic SoC detection to mbus driver Stefan Roese
2015-04-14 15:31   ` Thomas Petazzoni
2015-04-15  8:45     ` Stefan Roese
2015-04-14 10:46 ` [U-Boot] [PATCH v2 11/13] arm: mvebu: mv-common.h: Add CONFIG_PREBOOT Stefan Roese
2015-04-14 10:46 ` [U-Boot] [PATCH v2 12/13] arm: mvebu: Add d-cache invalidate before enabling the d-cache Stefan Roese
2015-04-14 10:46 ` [U-Boot] [PATCH v2 13/13] arm: mvebu: Add Armada A38x DB-88F6820-GP board support Stefan Roese
2015-04-16 20:22 ` [U-Boot] [PATCH v2 0/13] Add Marvell Armada A38x 88F6820 SoC support Kevin Smith

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1429008415-27458-5-git-send-email-sr@denx.de \
    --to=sr@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.