summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorAjay Bhargav <[ajay.bhargav@einfochips.com]>2011-10-31 17:27:46 +0530
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-11-03 22:56:21 +0100
commite0c8fa8f1f234e82b34bf279c86b93e115be8c6d (patch)
tree904b44b58ccd6d8cb1b0531467ede8d2408e0acb /include/configs
parent0ac16bf32d3c3c9c76ede002a49ab4e864a57e57 (diff)
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 <ajay.bhargav@einfochips.com>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/gplugd.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 24bf7675d6..9813309247 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -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