diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/bamboo.h | 14 | ||||
| -rw-r--r-- | include/configs/bubinga.h | 3 | ||||
| -rw-r--r-- | include/configs/ebony.h | 12 | ||||
| -rw-r--r-- | include/configs/luan.h | 14 | ||||
| -rw-r--r-- | include/configs/ocotea.h | 19 | ||||
| -rw-r--r-- | include/configs/walnut.h | 21 | ||||
| -rw-r--r-- | include/configs/yellowstone.h | 7 | ||||
| -rw-r--r-- | include/configs/yosemite.h | 7 | ||||
| -rw-r--r-- | include/configs/yucca.h | 9 | 
9 files changed, 83 insertions, 23 deletions
| diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 2c1c31927..cd4339b58 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -310,11 +310,11 @@  #define CONFIG_COMMANDS	       (CONFIG_CMD_DFL	| \  				CFG_CMD_ASKENV	| \ -				CFG_CMD_EEPROM	| \  				CFG_CMD_DATE	| \  				CFG_CMD_DHCP	| \  				CFG_CMD_DIAG	| \  				CFG_CMD_ELF	| \ +				CFG_CMD_EEPROM	| \  				CFG_CMD_I2C	| \  				CFG_CMD_IRQ	| \  				CFG_CMD_MII	| \ @@ -358,13 +358,11 @@  #define CFG_HZ		        1000	/* decrementer freq: 1 ms ticks */ -#define CONFIG_CMDLINE_EDITING - -#ifdef CONFIG_CMDLINE_EDITING -#undef CONFIG_AUTO_COMPLETE -#else -#define CONFIG_AUTO_COMPLETE -#endif +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/ +#define CONFIG_LOOPW            1       /* enable loopw command         */ +#define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */ +#define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */ +#define CONFIG_VERSION_VARIABLE 1	/* include version env variable */  /*-----------------------------------------------------------------------   * PCI stuff diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index 4a79835d6..a66cdc395 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -200,8 +200,9 @@  #define	CFG_HZ		1000		/* decrementer freq: 1 ms ticks	*/ -#define CONFIG_AUTO_COMPLETE	1       /* add autocompletion support   */ +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/  #define CONFIG_LOOPW            1       /* enable loopw command         */ +#define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */  #define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */  #define CONFIG_VERSION_VARIABLE 1	/* include version env variable */ diff --git a/include/configs/ebony.h b/include/configs/ebony.h index a26af6952..d8882ea31 100644 --- a/include/configs/ebony.h +++ b/include/configs/ebony.h @@ -143,7 +143,13 @@  #undef	CONFIG_SOFT_I2C			    /* I2C bit-banged		*/  #define CFG_I2C_SPEED		400000	/* I2C speed and slave address	*/  #define CFG_I2C_SLAVE		0x7F -#define CFG_I2C_NOPROBES    {0x69}  /* Don't probe these addrs */ + +#define CFG_I2C_MULTI_EEPROMS +#define CFG_I2C_EEPROM_ADDR	(0xa8>>1) +#define CFG_I2C_EEPROM_ADDR_LEN 1 +#define CFG_EEPROM_PAGE_WRITE_ENABLE +#define CFG_EEPROM_PAGE_WRITE_BITS 3 +#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10  #define CONFIG_PREBOOT	"echo;"	\  	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \ @@ -205,6 +211,7 @@  				CFG_CMD_DHCP	| \  				CFG_CMD_DIAG	| \  				CFG_CMD_ELF	| \ +				CFG_CMD_EEPROM	| \  				CFG_CMD_I2C	| \  				CFG_CMD_IRQ	| \  				CFG_CMD_MII	| \ @@ -243,8 +250,9 @@  #define CFG_HZ		1000		/* decrementer freq: 1 ms ticks */ -#define CONFIG_AUTO_COMPLETE	1       /* add autocompletion support   */ +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/  #define CONFIG_LOOPW            1       /* enable loopw command         */ +#define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */  #define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */  #define CONFIG_VERSION_VARIABLE 1	/* include version env variable */ diff --git a/include/configs/luan.h b/include/configs/luan.h index 0335a0098..0350e91f0 100644 --- a/include/configs/luan.h +++ b/include/configs/luan.h @@ -145,6 +145,13 @@  #define CFG_I2C_SPEED		400000	/* I2C speed and slave address	*/  #define CFG_I2C_SLAVE		0x7F +#define CFG_I2C_MULTI_EEPROMS +#define CFG_I2C_EEPROM_ADDR	(0xa8>>1) +#define CFG_I2C_EEPROM_ADDR_LEN 1 +#define CFG_EEPROM_PAGE_WRITE_ENABLE +#define CFG_EEPROM_PAGE_WRITE_BITS 3 +#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 +  #define CONFIG_PREBOOT	"echo;"	\  	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \  	"echo" @@ -215,6 +222,7 @@  				CFG_CMD_DHCP		|	\  				CFG_CMD_DIAG		|	\  				CFG_CMD_ELF		|	\ +				CFG_CMD_EEPROM		|	\  				CFG_CMD_I2C		|	\  				CFG_CMD_IRQ		|	\  				CFG_CMD_MII		|	\ @@ -253,6 +261,12 @@  #define CFG_HZ		        1000	/* decrementer freq: 1 ms ticks */ +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/ +#define CONFIG_LOOPW            1       /* enable loopw command         */ +#define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */ +#define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */ +#define CONFIG_VERSION_VARIABLE 1	/* include version env variable */ +  /*-----------------------------------------------------------------------   * PCI stuff   *----------------------------------------------------------------------- diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h index a13d6a870..89e9164e0 100644 --- a/include/configs/ocotea.h +++ b/include/configs/ocotea.h @@ -158,7 +158,13 @@  #undef	CONFIG_SOFT_I2C			    /* I2C bit-banged		*/  #define CFG_I2C_SPEED		400000	/* I2C speed and slave address	*/  #define CFG_I2C_SLAVE		0x7F -#define CFG_I2C_NOPROBES    {0x69}  /* Don't probe these addrs */ + +#define CFG_I2C_MULTI_EEPROMS +#define CFG_I2C_EEPROM_ADDR	(0xa8>>1) +#define CFG_I2C_EEPROM_ADDR_LEN 1 +#define CFG_EEPROM_PAGE_WRITE_ENABLE +#define CFG_EEPROM_PAGE_WRITE_BITS 3 +#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10  #define CONFIG_PREBOOT	"echo;"	\  	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \ @@ -219,6 +225,9 @@  #define CONFIG_PHY_GIGE		1	/* Include GbE speed/duplex detection */  #define CONFIG_PHY_RESET        1       /* reset phy upon startup         */  #define CONFIG_PHY_RESET_DELAY	1000 +#define CFG_RX_ETH_BUFFER	32	/* Number of ethernet rx buffers & descriptors */ + +#define CONFIG_NETCONSOLE		/* include NetConsole support	*/  #define CONFIG_COMMANDS	       (CONFIG_CMD_DFL	| \  				CFG_CMD_ASKENV	| \ @@ -226,6 +235,7 @@  				CFG_CMD_DHCP	| \  				CFG_CMD_DIAG	| \  				CFG_CMD_ELF	| \ +				CFG_CMD_EEPROM	| \  				CFG_CMD_I2C	| \  				CFG_CMD_IRQ	| \  				CFG_CMD_MII	| \ @@ -264,15 +274,12 @@  #define CFG_HZ			1000	/* decrementer freq: 1 ms ticks */ -#define CONFIG_AUTO_COMPLETE	1       /* add autocompletion support   */ +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/  #define CONFIG_LOOPW            1       /* enable loopw command         */ +#define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */  #define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */  #define CONFIG_VERSION_VARIABLE 1	/* include version env variable */ -#define CFG_RX_ETH_BUFFER	32	/* Number of ethernet rx buffers & descriptors */ - -#define CONFIG_NETCONSOLE		/* include NetConsole support	*/ -  /*-----------------------------------------------------------------------   * PCI stuff   *----------------------------------------------------------------------- diff --git a/include/configs/walnut.h b/include/configs/walnut.h index 1171ee5ae..28abd6e15 100644 --- a/include/configs/walnut.h +++ b/include/configs/walnut.h @@ -90,6 +90,11 @@  #define CONFIG_MII		1	/* MII PHY management		*/  #define CONFIG_PHY_ADDR		1	/* PHY address			*/ +#define CFG_RX_ETH_BUFFER	16	/* use 16 rx buffer on 405 emac */ + +#define CONFIG_NETCONSOLE		/* include NetConsole support	*/ +#define CONFIG_NET_MULTI		/* needed for NetConsole	*/ +  #define CONFIG_RTC_DS174x	1	/* use DS1743 RTC in Walnut	*/  #define CONFIG_COMMANDS	       (CONFIG_CMD_DFL	| \ @@ -97,6 +102,7 @@  				CFG_CMD_DATE	| \  				CFG_CMD_DHCP	| \  				CFG_CMD_DIAG	| \ +				CFG_CMD_EEPROM	| \  				CFG_CMD_ELF	| \  				CFG_CMD_I2C	| \  				CFG_CMD_IRQ	| \ @@ -156,16 +162,12 @@  #define CFG_HZ		1000		/* decrementer freq: 1 ms ticks */ -#define CONFIG_AUTO_COMPLETE	1	/* add autocompletion support	*/ +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/  #define CONFIG_LOOPW		1	/* enable loopw command		*/ +#define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */  #define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */  #define CONFIG_VERSION_VARIABLE 1	/* include version env variable */ -#define CFG_RX_ETH_BUFFER	16	/* use 16 rx buffer on 405 emac */ - -#define CONFIG_NETCONSOLE		/* include NetConsole support	*/ -#define CONFIG_NET_MULTI		/* needed for NetConsole	*/ -  /*-----------------------------------------------------------------------   * I2C stuff   *----------------------------------------------------------------------- @@ -175,6 +177,13 @@  #define CFG_I2C_SPEED		400000	/* I2C speed and slave address	*/  #define CFG_I2C_SLAVE		0x7F +#define CFG_I2C_MULTI_EEPROMS +#define CFG_I2C_EEPROM_ADDR	(0xa8>>1) +#define CFG_I2C_EEPROM_ADDR_LEN 1 +#define CFG_EEPROM_PAGE_WRITE_ENABLE +#define CFG_EEPROM_PAGE_WRITE_BITS 3 +#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 +  /*-----------------------------------------------------------------------   * PCI stuff   *----------------------------------------------------------------------- diff --git a/include/configs/yellowstone.h b/include/configs/yellowstone.h index 7d555665e..cf42b666b 100644 --- a/include/configs/yellowstone.h +++ b/include/configs/yellowstone.h @@ -229,6 +229,7 @@  				CFG_CMD_DHCP	| \  				CFG_CMD_DIAG	| \  				CFG_CMD_ELF	| \ +				CFG_CMD_EEPROM	| \  				CFG_CMD_I2C	| \  				CFG_CMD_IRQ	| \  				CFG_CMD_MII	| \ @@ -265,6 +266,12 @@  #define CFG_HZ		        1000	/* decrementer freq: 1 ms ticks */ +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/ +#define CONFIG_LOOPW            1       /* enable loopw command         */ +#define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */ +#define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */ +#define CONFIG_VERSION_VARIABLE 1	/* include version env variable */ +  /*-----------------------------------------------------------------------   * PCI stuff   *----------------------------------------------------------------------- diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index a81cf34f1..86a85b8a6 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -231,6 +231,7 @@  				CFG_CMD_DHCP	| \  				CFG_CMD_DIAG	| \  				CFG_CMD_ELF	| \ +				CFG_CMD_EEPROM	| \  				CFG_CMD_I2C	| \  				CFG_CMD_IRQ	| \  				CFG_CMD_MII	| \ @@ -272,6 +273,12 @@  #define CFG_HZ		        1000	/* decrementer freq: 1 ms ticks */ +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/ +#define CONFIG_LOOPW            1       /* enable loopw command         */ +#define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */ +#define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */ +#define CONFIG_VERSION_VARIABLE 1	/* include version env variable */ +  /*-----------------------------------------------------------------------   * PCI stuff   *----------------------------------------------------------------------- diff --git a/include/configs/yucca.h b/include/configs/yucca.h index 26a330eea..884f85c31 100644 --- a/include/configs/yucca.h +++ b/include/configs/yucca.h @@ -223,6 +223,9 @@  #define CONFIG_PHY_GIGE		1	/* Include GbE speed/duplex detection */  #define CFG_RX_ETH_BUFFER	32	/* Number of ethernet rx buffers & descriptors */ +#define CONFIG_NETCONSOLE		/* include NetConsole support	*/ +#define CONFIG_NET_MULTI		/* needed for NetConsole	*/ +  #undef CONFIG_WATCHDOG			/* watchdog disabled		*/  /* @@ -248,6 +251,12 @@  #define CFG_HZ			1000		/* decrementer freq: 1 ms ticks */ +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/ +#define CONFIG_LOOPW            1       /* enable loopw command         */ +#define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */ +#define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */ +#define CONFIG_VERSION_VARIABLE 1	/* include version env variable */ +  /*-----------------------------------------------------------------------   * FLASH related   *----------------------------------------------------------------------*/ |