diff options
| author | Jon Loeliger <jdl@jdl.com> | 2007-06-11 19:03:19 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 00:34:58 +0200 |
| commit | 5e378003d592ea828ec69d6defcd4de79096dd5c (patch) | |
| tree | e3687f00dcedf80e11f84caa3d519684c6843bd8 /board/bf537-stamp | |
| parent | 737184114ec9c9e0ab94d6713536126073bd2472 (diff) | |
| download | u-boot-imx-5e378003d592ea828ec69d6defcd4de79096dd5c.zip u-boot-imx-5e378003d592ea828ec69d6defcd4de79096dd5c.tar.gz u-boot-imx-5e378003d592ea828ec69d6defcd4de79096dd5c.tar.bz2 | |
board/[Ma-i]*: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).
This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.
All transformations are of the form:
Before:
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'board/bf537-stamp')
| -rw-r--r-- | board/bf537-stamp/bf537-stamp.c | 2 | ||||
| -rw-r--r-- | board/bf537-stamp/ether_bf537.c | 2 | ||||
| -rw-r--r-- | board/bf537-stamp/nand.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c index 47f7c9e..4f783ad 100644 --- a/board/bf537-stamp/bf537-stamp.c +++ b/board/bf537-stamp/bf537-stamp.c @@ -159,7 +159,7 @@ int misc_init_r(void) unsigned char *pMACaddr = (unsigned char *)0x203F0000; u8 SrcAddr[6] = { 0x02, 0x80, 0xAD, 0x20, 0x31, 0xB8 }; -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) /* The 0xFF check here is to make sure we don't use the address * in flash if it's simply been erased (aka all 0xFF values) */ if (getenv("ethaddr") == NULL && is_valid_ether_addr(pMACaddr)) { diff --git a/board/bf537-stamp/ether_bf537.c b/board/bf537-stamp/ether_bf537.c index 807b9e8..a96f8d5 100644 --- a/board/bf537-stamp/ether_bf537.c +++ b/board/bf537-stamp/ether_bf537.c @@ -42,7 +42,7 @@ #define DEBUGF(fmt,args...) #endif -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) #define RXBUF_BASE_ADDR 0xFF900000 #define TXBUF_BASE_ADDR 0xFF800000 diff --git a/board/bf537-stamp/nand.c b/board/bf537-stamp/nand.c index 4d6e776..11da14e 100644 --- a/board/bf537-stamp/nand.c +++ b/board/bf537-stamp/nand.c @@ -23,7 +23,7 @@ #include <common.h> #include <asm/io.h> -#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #include <nand.h> |