mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-24 12:44:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some compile problems introduced by the latest CFG_CMD_xxx cleanup

Browse Source 
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2007-07-11 12:13:53 +02:00 committed by Wolfgang Denk
parent e9514751cf
commit 3865b1fb78
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/cmd_flash.c
View File

@ -33,7 +33,7 @@
#if defined(CONFIG_CMD_FLASH)
#if (defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
#include <jffs2/jffs2.h>
/* parition handling routines */

5
common/cmd_nvedit.c
View File

@ -538,7 +538,7 @@ int getenv_r (char *name, char *buf, unsigned len)
return (-1);
}
#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) || \
#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@ -550,7 +550,6 @@ int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return (saveenv() ? 1 : 0);
}
#endif
@ -594,7 +593,7 @@ U_BOOT_CMD(
" - delete environment variable 'name'\n"
);
#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) || \
#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
U_BOOT_CMD(

2
drivers/macb.c
View File

@ -18,7 +18,7 @@
#include <common.h>
#if defined(CONFIG_MACB) \
&& (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII)))
&& (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII))
/*
* The u-boot networking stack is a little weird. It seems like the

3
net/nfs.c
View File

@ -31,8 +31,7 @@
/*#define NFS_DEBUG*/
#if (defined(CONFIG_CMD_NET) \
&& defined(CONFIG_CMD_NFS)
#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_NFS)
#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
#define NFS_TIMEOUT 60

3
net/sntp.c
View File

@ -12,8 +12,7 @@
#include "sntp.h"
#if (defined(CONFIG_CMD_NET) \
&& defined(CONFIG_CMD_SNTP)
#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_SNTP)
#define SNTP_TIMEOUT 10