summaryrefslogtreecommitdiff
path: root/include/configs/bamboo.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-10-21 22:41:25 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-10-21 22:41:25 +0200
commit7b5cac0e1958173a390ae6d620a610028cad25f8 (patch)
treed045cc641164a0eca524a862831921790abb43eb /include/configs/bamboo.h
parent6902df56a0b493f369153b09d11afcd74a580561 (diff)
parente9f1110051c2c2f8c005cf7fae54194f07197bac (diff)
downloadu-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/configs/bamboo.h')
-rw-r--r--include/configs/bamboo.h4
1 files changed, 3 insertions, 1 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