X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fgplugd.h;h=462cc7e16c8117576f4879139e4f026fda18b2f3;hb=d9fdfe0aa598978054f108ba42ca928aceb8c090;hp=5f72163473f074f3f7b8ec5e89ef493dbcf822f8;hpb=1e02c20ac925fbc527b8579e42f0a6bd610a0760;p=oweals%2Fu-boot.git

diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 5f72163473..462cc7e16c 100644
--- 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
@@ -62,6 +72,9 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_AUTOSCRIPT
 #undef CONFIG_CMD_FPGA
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
 
 /* Disable DCACHE */
 #define CONFIG_SYS_DCACHE_OFF
@@ -69,7 +82,6 @@
 /* Network configuration */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_CMD_PING
-#define CONFIG_NET_MULTI
 #define CONFIG_ARMADA100_FEC
 
 /* DHCP Support */
@@ -91,6 +103,15 @@
 /* GPIO Configuration for PHY */
 #define CONFIG_SYS_GPIO_PHY_RST		104	/* GPIO104 */
 
+/* SPI Support */
+#define CONFIG_ARMADA100_SPI
+#define CONFIG_ENV_SPI_CS		110
+#define CONFIG_SYS_SSP_PORT		2
+
+/* Flash Support */
+#define CONFIG_CMD_SF
+#define CONFIG_SPI_FLASH_ATMEL
+
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros
@@ -107,7 +128,24 @@
 /*
  * Environment variables configurations
  */
-#define CONFIG_ENV_IS_NOWHERE	1	/* if env in SDRAM */
-#define CONFIG_ENV_SIZE	0x20000		/* 64k */
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_SECT_SIZE		0x4000
+#define CONFIG_ENV_SIZE			0x4000
+#define CONFIG_ENV_OFFSET		0x07C000
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_EDITENV
+#define CONFIG_CMD_SAVEENV
+
+#ifdef CONFIG_CMD_USB
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_ARMADA100
+#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_STORAGE
+#endif /* CONFIG_CMD_USB */
+
+#define CONFIG_DOS_PARTITION
+#define CONFIG_ISO_PARTITION
+#define CONFIG_SUPPORT_VFAT
 
 #endif	/* __CONFIG_GPLUGD_H */