Fix some compile problems introduced by the latest CFG_CMD_xxx cleanup
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
e9514751cf
commit
3865b1fb78
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_FLASH)
|
#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>
|
#include <jffs2/jffs2.h>
|
||||||
|
|
||||||
/* parition handling routines */
|
/* parition handling routines */
|
||||||
|
|
|
@ -538,7 +538,7 @@ int getenv_r (char *name, char *buf, unsigned len)
|
||||||
return (-1);
|
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_FLASH)) \
|
||||||
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
|
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
|
||||||
int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
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);
|
return (saveenv() ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -594,7 +593,7 @@ U_BOOT_CMD(
|
||||||
" - delete environment variable 'name'\n"
|
" - 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_FLASH)) \
|
||||||
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
|
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
|
||||||
U_BOOT_CMD(
|
U_BOOT_CMD(
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
|
||||||
#if defined(CONFIG_MACB) \
|
#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
|
* The u-boot networking stack is a little weird. It seems like the
|
||||||
|
|
|
@ -31,8 +31,7 @@
|
||||||
|
|
||||||
/*#define NFS_DEBUG*/
|
/*#define NFS_DEBUG*/
|
||||||
|
|
||||||
#if (defined(CONFIG_CMD_NET) \
|
#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_NFS)
|
||||||
&& defined(CONFIG_CMD_NFS)
|
|
||||||
|
|
||||||
#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
|
#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
|
||||||
#define NFS_TIMEOUT 60
|
#define NFS_TIMEOUT 60
|
||||||
|
|
|
@ -12,8 +12,7 @@
|
||||||
|
|
||||||
#include "sntp.h"
|
#include "sntp.h"
|
||||||
|
|
||||||
#if (defined(CONFIG_CMD_NET) \
|
#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_SNTP)
|
||||||
&& defined(CONFIG_CMD_SNTP)
|
|
||||||
|
|
||||||
#define SNTP_TIMEOUT 10
|
#define SNTP_TIMEOUT 10
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue