Skip to contentSkip to conversation

gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared

PATCH New Ajay Bhargav 3 participants 3 messages Oct 31, 2011

lore
Share & tools
lore

Ajay Bhargav

author
#0 lore raw

PATCH 1/1 gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared

This patch fix the build failure (error: 'MACH_TYPE_SHEEVAD' undeclared (first use in this function)) for gplugD due to recent sync of mach-types.h with its linux original.

Signed-off-by Ajay Bhargav <[email protected]>
---
 include/configs/gplugd.h |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
include/configs/gplugd.h +11 -1
index 24bf767..9813309 100644
@@ -32,6 +32,16 @@
 #define __CONFIG_GPLUGD_H
 
 /*
+ * FIXME: fix for error caused due to recent update to mach-types.h
+ */
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_SHEEVAD
+#error "MACH_TYPE_SHEEVAD has been defined properly, please remove this."
+#else
+#define MACH_TYPE_SHEEVAD	2625
+#endif
+
+/*
  * Version number information
  */
 #define CONFIG_IDENT_STRING	"\nMarvell-gplugD"

@@ -42,7 +52,7 @@
 #define CONFIG_SHEEVA_88SV331xV5	1	/* CPU Core subversion */
 #define CONFIG_ARMADA100		1	/* SOC Family Name */
 #define CONFIG_ARMADA168		1	/* SOC Used on this Board */
-#define CONFIG_MACH_SHEEVAD			/* Machine type */
+#define CONFIG_MACH_TYPE		MACH_TYPE_SHEEVAD /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
 #define	CONFIG_SYS_TEXT_BASE	0x00f00000
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared

Quoted 5 lines · Ajay Bhargav

This patch fix the build failure (error: 'MACH_TYPE_SHEEVAD' undeclared (first use in this function)) for gplugD due to recent sync of mach-types.h with its linux original.

Signed-off-by Ajay Bhargav <[email protected]>
Acked-by Igor Grinberg <[email protected]>
Quoted 34 lines
---
 include/configs/gplugd.h |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
include/configs/gplugd.h +11 -1
index 24bf767..9813309 100644
@@ -32,6 +32,16 @@
 #define __CONFIG_GPLUGD_H
 
 /*
+ * FIXME: fix for error caused due to recent update to mach-types.h
+ */
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_SHEEVAD
+#error "MACH_TYPE_SHEEVAD has been defined properly, please remove this."
+#else
+#define MACH_TYPE_SHEEVAD	2625
+#endif
+
+/*
  * Version number information
  */
 #define CONFIG_IDENT_STRING	"\nMarvell-gplugD"

@@ -42,7 +52,7 @@
 #define CONFIG_SHEEVA_88SV331xV5	1	/* CPU Core subversion */
 #define CONFIG_ARMADA100		1	/* SOC Family Name */
 #define CONFIG_ARMADA168		1	/* SOC Used on this Board */
-#define CONFIG_MACH_SHEEVAD			/* Machine type */
+#define CONFIG_MACH_TYPE		MACH_TYPE_SHEEVAD /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
 #define	CONFIG_SYS_TEXT_BASE	0x00f00000
Signature · 2 lines
Regards,
Igor.
#2 lore raw

PATCH 1/1 gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared

In reply to Ajay Bhargav
Quoted 55 lines

-----Original Message-----
From: Ajay Bhargav [mailto:ajay.bhargav at einfochips.com]
Sent: Monday, October 31, 2011 1:07 PM
To: Prafulla Wadaskar
Cc: u-boot at lists.denx.de; albert.u.boot at aribaud.net; marek.vasut at gmail.com; Ajay Bhargav
Subject: [PATCH] gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared

This patch fix the build failure (error: 'MACH_TYPE_SHEEVAD' undeclared
(first use in this function)) for gplugD due to recent sync of mach-types.h with its linux original.

Signed-off-by Ajay Bhargav <[email protected]>
---
 include/configs/gplugd.h |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
include/configs/gplugd.h +1 -0
index 24bf767..9813309 100644
@@ -32,6 +32,16 @@
 #define __CONFIG_GPLUGD_H
 
 /*
+ * FIXME: fix for error caused due to recent update to mach-

types.h
+ */

include/configs/gplugd.h +3 -0
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_SHEEVAD
+#error "MACH_TYPE_SHEEVAD has been defined properly, please

remove this."

include/configs/gplugd.h +6 -1
+#else
+#define MACH_TYPE_SHEEVAD	2625
+#endif
+
+/*
  * Version number information
  */
 #define CONFIG_IDENT_STRING	"\nMarvell-gplugD"

@@ -42,7 +52,7 @@
 #define CONFIG_SHEEVA_88SV331xV5	1	/* CPU Core subversion */
 #define CONFIG_ARMADA100		1	/* SOC Family Name */
 #define CONFIG_ARMADA168		1	/* SOC Used on this Board */
-#define CONFIG_MACH_SHEEVAD			/* Machine type */
+#define CONFIG_MACH_TYPE		MACH_TYPE_SHEEVAD /* Machine type
 */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board

lowlevel_init */

Quoted 3 lines

#define CONFIG_SYS_TEXT_BASE 0x00f00000
--
1.7.0.4

Applied to u-boot-marvell.git master branch

Regards..
Prafulla . . .