X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fgplugd.h;h=f2260eae56436530930bf54a2dc59f93b60c0cb4;hb=5b8e76c35ec312a3f73126bd1a2d2c0965b98a9f;hp=92e211713cb78fa9317e63343bf492ca5d2b4627;hpb=cb71c6d85409715f541261f0bdda4a8060128689;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 92e2117..f2260ea 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -1,7 +1,7 @@ /* * (C) Copyright 2011 * eInfochips Ltd. - * Written-by: Ajay Bhargav + * Written-by: Ajay Bhargav * * Based on Aspenite: * (C) Copyright 2010 @@ -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 @@ -46,7 +36,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ /* Disable DCACHE */ #define CONFIG_SYS_DCACHE_OFF @@ -79,7 +68,6 @@ * to enable certain macros */ #include "mv-common.h" -#undef CONFIG_ARCH_MISC_INIT #ifdef CONFIG_SYS_NS16550_COM1 #undef CONFIG_SYS_NS16550_COM1 @@ -94,13 +82,10 @@ #define CONFIG_ENV_SIZE 0x4000 #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ARMADA100 #define CONFIG_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */ -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_VFAT #endif /* __CONFIG_GPLUGD_H */