projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sandbox' of git://git.denx.de/u-boot-blackfin
[oweals/u-boot.git]
/
include
/
configs
/
gplugd.h
diff --git
a/include/configs/gplugd.h
b/include/configs/gplugd.h
index 5f72163473f074f3f7b8ec5e89ef493dbcf822f8..98133092470069a5a776287f3afb8f1ee8ecd082 100644
(file)
--- a/
include/configs/gplugd.h
+++ b/
include/configs/gplugd.h
@@
-31,6
+31,16
@@
#ifndef __CONFIG_GPLUGD_H
#define __CONFIG_GPLUGD_H
#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
*/
/*
* 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_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
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#define CONFIG_SYS_TEXT_BASE 0x00f00000
@@
-69,7
+79,6
@@
/* Network configuration */
#ifdef CONFIG_CMD_NET
#define CONFIG_CMD_PING
/* Network configuration */
#ifdef CONFIG_CMD_NET
#define CONFIG_CMD_PING
-#define CONFIG_NET_MULTI
#define CONFIG_ARMADA100_FEC
/* DHCP Support */
#define CONFIG_ARMADA100_FEC
/* DHCP Support */
@@
-91,6
+100,15
@@
/* GPIO Configuration for PHY */
#define CONFIG_SYS_GPIO_PHY_RST 104 /* GPIO104 */
/* 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
/*
* mv-common.h should be defined after CMD configs since it used them
* to enable certain macros
@@
-107,7
+125,13
@@
/*
* Environment variables configurations
*/
/*
* 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
#endif /* __CONFIG_GPLUGD_H */
#endif /* __CONFIG_GPLUGD_H */