diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-21 22:41:25 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-21 22:41:25 +0200 |
| commit | 7b5cac0e1958173a390ae6d620a610028cad25f8 (patch) | |
| tree | d045cc641164a0eca524a862831921790abb43eb /include | |
| parent | 6902df56a0b493f369153b09d11afcd74a580561 (diff) | |
| parent | e9f1110051c2c2f8c005cf7fae54194f07197bac (diff) | |
| download | u-boot-imx-7b5cac0e1958173a390ae6d620a610028cad25f8.zip u-boot-imx-7b5cac0e1958173a390ae6d620a610028cad25f8.tar.gz u-boot-imx-7b5cac0e1958173a390ae6d620a610028cad25f8.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/bamboo.h | 4 | ||||
| -rw-r--r-- | include/configs/bubinga.h | 2 | ||||
| -rw-r--r-- | include/configs/ebony.h | 2 | ||||
| -rw-r--r-- | include/configs/ocotea.h | 4 | ||||
| -rw-r--r-- | include/configs/walnut.h | 3 | ||||
| -rw-r--r-- | include/configs/yellowstone.h | 4 | ||||
| -rw-r--r-- | include/configs/yosemite.h | 4 |
7 files changed, 19 insertions, 4 deletions
diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 01f86f5..95f9b5c 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -278,12 +278,14 @@ #define CONFIG_PHY1_ADDR 1 #ifndef CONFIG_BAMBOO_NAND -#define CONFIG_NET_MULTI 1 /* required for netconsole */ #define CONFIG_HAS_ETH1 1 /* add support for "eth1addr" */ #endif /* CONFIG_BAMBOO_NAND */ #define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */ +#define CONFIG_NETCONSOLE /* include NetConsole support */ +#define CONFIG_NET_MULTI 1 /* required for netconsole */ + /* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index 5feb63a..2f99ef0 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -132,6 +132,8 @@ #define CONFIG_NET_MULTI 1 #define CFG_RX_ETH_BUFFER 16 /* Number of ethernet rx buffers & descriptors */ +#define CONFIG_NETCONSOLE /* include NetConsole support */ + #define CONFIG_RTC_DS174x 1 /* use DS1743 RTC in Bubinga */ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ diff --git a/include/configs/ebony.h b/include/configs/ebony.h index 5f608be..8eb4697 100644 --- a/include/configs/ebony.h +++ b/include/configs/ebony.h @@ -197,6 +197,8 @@ #define CONFIG_NET_MULTI 1 #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 | \ CFG_CMD_DATE | \ diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h index 5a27c02..49dd487 100644 --- a/include/configs/ocotea.h +++ b/include/configs/ocotea.h @@ -269,7 +269,9 @@ #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 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 d33956d..6dbce57 100644 --- a/include/configs/walnut.h +++ b/include/configs/walnut.h @@ -163,6 +163,9 @@ #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 *----------------------------------------------------------------------- diff --git a/include/configs/yellowstone.h b/include/configs/yellowstone.h index f2cd053..092959e 100644 --- a/include/configs/yellowstone.h +++ b/include/configs/yellowstone.h @@ -200,7 +200,9 @@ #define CONFIG_HAS_ETH1 1 /* add support for "eth1addr" */ #define CONFIG_PHY_ADDR 1 /* PHY address, See schematics */ -#define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */ +#define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */ + +#define CONFIG_NETCONSOLE /* include NetConsole support */ /* Partitions */ #define CONFIG_MAC_PARTITION diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index 141cdb1..d2bba98 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -200,7 +200,9 @@ #define CONFIG_HAS_ETH1 1 /* add support for "eth1addr" */ #define CONFIG_PHY_ADDR 1 /* PHY address, See schematics */ -#define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */ +#define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */ + +#define CONFIG_NETCONSOLE /* include NetConsole support */ /* Partitions */ #define CONFIG_MAC_PARTITION |