summaryrefslogtreecommitdiff
path: root/include/configs/gplugd.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-01-26 01:42:36 (GMT)
committerTom Rini <trini@konsulko.com>2017-01-28 19:04:24 (GMT)
commit92a1babf75e90b45026ef0b0e83a6be0343fb70a (patch)
treef15cead6304a7359ca9c02072ce4b81383afa6ab /include/configs/gplugd.h
parent94ba26f2bcc02013e8b7561d070d6d2eb4f091be (diff)
downloadu-boot-92a1babf75e90b45026ef0b0e83a6be0343fb70a.tar.xz
arm: Clean up MACH_TYPE_xxx usage after re-sync of mach-types
With the latest mach-types values we have many instances where we no longer need to define a value and a few cases where the name (but not value) have changed slightly. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/gplugd.h')
-rw-r--r--include/configs/gplugd.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 7f84f7f..5639a45 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -16,22 +16,12 @@
#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
-
-/*
* High Level Configuration Options
*/
#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_TYPE MACH_TYPE_SHEEVAD /* Machine type */
+#define CONFIG_MACH_TYPE MACH_TYPE_GPLUGD /* Machine type */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#define CONFIG_SYS_TEXT_BASE 0x00f00000