X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fgplugd.h;h=a0554d7f8e5b047785784d96f3cacc14137b7d6a;hb=19ea606109135c3d9892d86e1b1c2a8fb551cc1b;hp=92e211713cb78fa9317e63343bf492ca5d2b4627;hpb=cb71c6d85409715f541261f0bdda4a8060128689;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 92e2117..a0554d7 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -1,55 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2011 * eInfochips Ltd. - * Written-by: Ajay Bhargav + * Written-by: Ajay Bhargav * * Based on Aspenite: * (C) Copyright 2010 * Marvell Semiconductor * Written-by: Prafulla Wadaskar * Contributor: Mahavir Jain - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_GPLUGD_H #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 - /* * There is no internal RAM in ARMADA100, using DRAM * TBD: dcache to be used for this */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE - 0x00200000) -#define CONFIG_NR_DRAM_BANKS_MAX 2 - -/* - * Commands configuration - */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ - -/* Disable DCACHE */ -#define CONFIG_SYS_DCACHE_OFF /* Network configuration */ #ifdef CONFIG_CMD_NET @@ -63,7 +41,6 @@ #define CONFIG_MARVELL_GPIO /* PHY configuration */ -#define CONFIG_MII #define CONFIG_RESET_PHY_R /* 88E3015 register definition */ #define PHY_LED_PAR_SEL_REG 22 @@ -79,7 +56,6 @@ * to enable certain macros */ #include "mv-common.h" -#undef CONFIG_ARCH_MISC_INIT #ifdef CONFIG_SYS_NS16550_COM1 #undef CONFIG_SYS_NS16550_COM1 @@ -90,17 +66,10 @@ /* * Environment variables configurations */ -#define CONFIG_ENV_IS_NOWHERE -#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 */