summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-08-15 11:55:35 -0500
committerWolfgang Denk <wd@denx.de>2007-08-15 20:52:49 +0200
commit30b52df9e906bf0e465916c2c6bb5192b438e0b8 (patch)
treed9bb981ea5267460a38269a7ef5ffb0b654a3144
parent210f463c71917b7a4495c2103c228b9c179ae64d (diff)
downloadu-boot-imx-30b52df9e906bf0e465916c2c6bb5192b438e0b8.zip
u-boot-imx-30b52df9e906bf0e465916c2c6bb5192b438e0b8.tar.gz
u-boot-imx-30b52df9e906bf0e465916c2c6bb5192b438e0b8.tar.bz2
86xx: Fix lingering CFG_CMD_* references in sbc8641d.h
Remove a leftover in net/tftp.c while we're at it. Signed-off-by: Jon Loeliger <jdl@freescale.com>
-rw-r--r--include/configs/sbc8641d.h6
-rw-r--r--net/tftp.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 68d31ca..277b611 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -492,7 +492,7 @@
#define CFG_LOAD_ADDR 0x2000000 /* default load address */
#define CFG_PROMPT "=> " /* Monitor Command Prompt */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@@ -513,7 +513,7 @@
/* Cache Configuration */
#define CFG_DCACHE_SIZE 32768
#define CFG_CACHELINE_SIZE 32
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 5 /*log base 2 of the above value*/
#endif
@@ -525,7 +525,7 @@
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
#define BOOTFLAG_WARM 0x02 /* Software reboot */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif
diff --git a/net/tftp.c b/net/tftp.c
index 888ec98..d6db91c 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -614,4 +614,4 @@ static void parse_multicast_oack(char *pkt, int len)
#endif /* Multicast TFTP */
-#endif /* CFG_CMD_NET */
+#endif