From 92a1babf75e90b45026ef0b0e83a6be0343fb70a Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 25 Jan 2017 20:42:36 -0500 Subject: 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 --- include/configs/gplugd.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'include/configs/gplugd.h') 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 -#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 -- cgit v1.1