Merge branch 'sandbox' of git://git.denx.de/u-boot-blackfin

[oweals/u-boot.git] / include / configs / gplugd.h

diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 24bf7675d6170839aaf16601e6d4770cba58a662..98133092470069a5a776287f3afb8f1ee8ecd082 100644 (file)
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -31,6 +31,16 @@
 #ifndef __CONFIG_GPLUGD_H
 #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
  */
@@ -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