V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

common/cmd_[a-f]* : 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>
This commit is contained in:
Jon Loeliger 2007-06-11 19:01:43 -05:00 committed by Wolfgang Denk
parent ec63b10b61
commit a76adc8142
21 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/cmd_autoscript.c
View File

@ -48,7 +48,7 @@
#endif #endif
#if defined(CONFIG_AUTOSCRIPT) || \ #if defined(CONFIG_AUTOSCRIPT) || \
(CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT ) (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
extern image_header_t header; /* from cmd_bootm.c */ extern image_header_t header; /* from cmd_bootm.c */
int int
@ -152,7 +152,7 @@ autoscript (ulong addr)
#endif /* CONFIG_AUTOSCRIPT || CFG_CMD_AUTOSCRIPT */ #endif /* CONFIG_AUTOSCRIPT || CFG_CMD_AUTOSCRIPT */
/**************************************************/ /**************************************************/
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
int int
do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
@ -170,7 +170,7 @@ do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return rcode; return rcode;
} }
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
U_BOOT_CMD( U_BOOT_CMD(
autoscr, 2, 0, do_autoscript, autoscr, 2, 0, do_autoscript,
"autoscr - run script from memory\n", "autoscr - run script from memory\n",

2
common/cmd_bdinfo.c
View File

@ -30,7 +30,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if (CONFIG_COMMANDS & CFG_CMD_BDI) #if (CONFIG_COMMANDS & CFG_CMD_BDI) || defined(CONFIG_CMD_BDI)
static void print_num(const char *, ulong); static void print_num(const char *, ulong);
#ifndef CONFIG_ARM /* PowerPC and other */ #ifndef CONFIG_ARM /* PowerPC and other */

2
common/cmd_bedbug.c
View File

@ -13,7 +13,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) #if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
#ifndef MAX #ifndef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b))

4
common/cmd_bmp.c
View File

@ -31,7 +31,7 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <malloc.h> #include <malloc.h>
#if (CONFIG_COMMANDS & CFG_CMD_BMP) #if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP)
static int bmp_info (ulong addr); static int bmp_info (ulong addr);
static int bmp_display (ulong addr, int x, int y); static int bmp_display (ulong addr, int x, int y);
@ -188,4 +188,4 @@ static int bmp_display(ulong addr, int x, int y)
#endif #endif
} }
#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) */ #endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP) */

22
common/cmd_bootm.c
View File

@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR;
/*cmd_boot.c*/ /*cmd_boot.c*/
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP) #if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
#include <rtc.h> #include <rtc.h>
#endif #endif
@ -89,11 +89,11 @@ int gunzip (void *, int, unsigned char *, unsigned long *);
static void *zalloc(void *, unsigned, unsigned); static void *zalloc(void *, unsigned, unsigned);
static void zfree(void *, void *, unsigned); static void zfree(void *, void *, unsigned);
#if (CONFIG_COMMANDS & CFG_CMD_IMI) #if (CONFIG_COMMANDS & CFG_CMD_IMI) || defined(CONFIG_CMD_IMI)
static int image_info (unsigned long addr); static int image_info (unsigned long addr);
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_IMLS) #if (CONFIG_COMMANDS & CFG_CMD_IMLS) || defined(CONFIG_CMD_IMLS)
#include <flash.h> #include <flash.h>
extern flash_info_t flash_info[]; /* info for FLASH chips */ extern flash_info_t flash_info[]; /* info for FLASH chips */
static int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); static int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
@ -133,7 +133,7 @@ static void fixup_silent_linux (void);
#endif #endif
static boot_os_Fcn do_bootm_netbsd; static boot_os_Fcn do_bootm_netbsd;
static boot_os_Fcn do_bootm_rtems; static boot_os_Fcn do_bootm_rtems;
#if (CONFIG_COMMANDS & CFG_CMD_ELF) #if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF)
static boot_os_Fcn do_bootm_vxworks; static boot_os_Fcn do_bootm_vxworks;
static boot_os_Fcn do_bootm_qnxelf; static boot_os_Fcn do_bootm_qnxelf;
int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] ); int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] );
@ -440,7 +440,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
addr, len_ptr, verify); addr, len_ptr, verify);
break; break;
#if (CONFIG_COMMANDS & CFG_CMD_ELF) #if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF)
case IH_OS_VXWORKS: case IH_OS_VXWORKS:
do_bootm_vxworks (cmdtp, flag, argc, argv, do_bootm_vxworks (cmdtp, flag, argc, argv,
addr, len_ptr, verify); addr, len_ptr, verify);
@ -1219,7 +1219,7 @@ do_bootm_artos (cmd_tbl_t *cmdtp, int flag,
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_BOOTD) #if (CONFIG_COMMANDS & CFG_CMD_BOOTD) || defined(CONFIG_CMD_BOOTD)
int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
int rcode = 0; int rcode = 0;
@ -1247,7 +1247,7 @@ U_BOOT_CMD(
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_IMI) #if (CONFIG_COMMANDS & CFG_CMD_IMI) || defined(CONFIG_CMD_IMI)
int do_iminfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_iminfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
int arg; int arg;
@ -1317,7 +1317,7 @@ U_BOOT_CMD(
#endif /* CFG_CMD_IMI */ #endif /* CFG_CMD_IMI */
#if (CONFIG_COMMANDS & CFG_CMD_IMLS) #if (CONFIG_COMMANDS & CFG_CMD_IMLS) || defined(CONFIG_CMD_IMLS)
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* List all images found in flash. * List all images found in flash.
*/ */
@ -1378,13 +1378,13 @@ U_BOOT_CMD(
void void
print_image_hdr (image_header_t *hdr) print_image_hdr (image_header_t *hdr)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP) #if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
time_t timestamp = (time_t)ntohl(hdr->ih_time); time_t timestamp = (time_t)ntohl(hdr->ih_time);
struct rtc_time tm; struct rtc_time tm;
#endif #endif
printf (" Image Name: %.*s\n", IH_NMLEN, hdr->ih_name); printf (" Image Name: %.*s\n", IH_NMLEN, hdr->ih_name);
#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP) #if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
to_tm (timestamp, &tm); to_tm (timestamp, &tm);
printf (" Created: %4d-%02d-%02d %2d:%02d:%02d UTC\n", printf (" Created: %4d-%02d-%02d %2d:%02d:%02d UTC\n",
tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_year, tm.tm_mon, tm.tm_mday,
@ -1588,7 +1588,7 @@ do_bootm_rtems (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
(*entry_point ) ( gd->bd ); (*entry_point ) ( gd->bd );
} }
#if (CONFIG_COMMANDS & CFG_CMD_ELF) #if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF)
static void static void
do_bootm_vxworks (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], do_bootm_vxworks (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
ulong addr, ulong *len_ptr, int verify) ulong addr, ulong *len_ptr, int verify)

2
common/cmd_cache.c
View File

@ -27,7 +27,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#if (CONFIG_COMMANDS & CFG_CMD_CACHE) #if (CONFIG_COMMANDS & CFG_CMD_CACHE) || defined(CONFIG_CMD_CACHE)
static int on_off (const char *); static int on_off (const char *);

2
common/cmd_console.c
View File

@ -28,7 +28,7 @@
#include <command.h> #include <command.h>
#include <devices.h> #include <devices.h>
#if (CONFIG_COMMANDS & CFG_CMD_CONSOLE) #if (CONFIG_COMMANDS & CFG_CMD_CONSOLE) || defined(CONFIG_CMD_CONSOLE)
extern void _do_coninfo (void); extern void _do_coninfo (void);
int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[]) int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])

2
common/cmd_date.c
View File

@ -31,7 +31,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if (CONFIG_COMMANDS & CFG_CMD_DATE) #if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE)
const char *weekdays[] = { const char *weekdays[] = {
"Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur", "Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur",

2
common/cmd_dcr.c
View File

@ -29,7 +29,7 @@
#include <config.h> #include <config.h>
#include <command.h> #include <command.h>
#if defined(CONFIG_4xx) && (CONFIG_COMMANDS & CFG_CMD_SETGETDCR) #if defined(CONFIG_4xx) && ((CONFIG_COMMANDS & CFG_CMD_SETGETDCR) || defined(CONFIG_CMD_SETGETDCR))
unsigned long get_dcr (unsigned short); unsigned long get_dcr (unsigned short);
unsigned long set_dcr (unsigned short, unsigned long); unsigned long set_dcr (unsigned short, unsigned long);

2
common/cmd_diag.c
View File

@ -28,7 +28,7 @@
#include <command.h> #include <command.h>
#include <post.h> #include <post.h>
#if (CONFIG_COMMANDS & CFG_CMD_DIAG) && defined(CONFIG_POST) #if ((CONFIG_COMMANDS & CFG_CMD_DIAG) || defined(CONFIG_CMD_DIAG)) && defined(CONFIG_POST)
int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{ {

2
common/cmd_display.c
View File

@ -24,7 +24,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#if (CONFIG_COMMANDS & CFG_CMD_DISPLAY) #if (CONFIG_COMMANDS & CFG_CMD_DISPLAY) || defined(CONFIG_CMD_DISPLAY)
#undef DEBUG_DISP #undef DEBUG_DISP

2
common/cmd_doc.c
View File

@ -19,7 +19,7 @@
# define SHOW_BOOT_PROGRESS(arg) # define SHOW_BOOT_PROGRESS(arg)
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_DOC) #if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
#include <linux/mtd/nftl.h> #include <linux/mtd/nftl.h>
#include <linux/mtd/doc2000.h> #include <linux/mtd/doc2000.h>

2
common/cmd_dtt.c
View File

@ -25,7 +25,7 @@
#include <config.h> #include <config.h>
#include <command.h> #include <command.h>
#if (CONFIG_COMMANDS & CFG_CMD_DTT) #if (CONFIG_COMMANDS & CFG_CMD_DTT) || defined(CONFIG_CMD_DTT)
#include <dtt.h> #include <dtt.h>
#include <i2c.h> #include <i2c.h>

8
common/cmd_eeprom.c
View File

@ -42,7 +42,7 @@
#include <command.h> #include <command.h>
#include <i2c.h> #include <i2c.h>
#if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CFG_ENV_IS_IN_EEPROM) #if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
extern void eeprom_init (void); extern void eeprom_init (void);
extern int eeprom_read (unsigned dev_addr, unsigned offset, extern int eeprom_read (unsigned dev_addr, unsigned offset,
@ -62,7 +62,7 @@ extern int eeprom_write_enable (unsigned dev_addr, int state);
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
#if (CONFIG_COMMANDS & CFG_CMD_EEPROM) #if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CONFIG_CMD_EEPROM)
int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{ {
const char *const fmt = const char *const fmt =
@ -121,7 +121,7 @@ int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
* 0x00000nxx for EEPROM address selectors and page number at n. * 0x00000nxx for EEPROM address selectors and page number at n.
*/ */
#if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CFG_ENV_IS_IN_EEPROM) #if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
#ifndef CONFIG_SPI #ifndef CONFIG_SPI
#if !defined(CFG_I2C_EEPROM_ADDR_LEN) || CFG_I2C_EEPROM_ADDR_LEN < 1 || CFG_I2C_EEPROM_ADDR_LEN > 2 #if !defined(CFG_I2C_EEPROM_ADDR_LEN) || CFG_I2C_EEPROM_ADDR_LEN < 1 || CFG_I2C_EEPROM_ADDR_LEN > 2
@ -425,7 +425,7 @@ void eeprom_init (void)
#endif /* CFG_CMD_EEPROM */ #endif /* CFG_CMD_EEPROM */
/***************************************************/ /***************************************************/
#if (CONFIG_COMMANDS & CFG_CMD_EEPROM) #if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CONFIG_CMD_EEPROM)
#ifdef CFG_I2C_MULTI_EEPROMS #ifdef CFG_I2C_MULTI_EEPROMS
U_BOOT_CMD( U_BOOT_CMD(

4
common/cmd_elf.c
View File

@ -23,7 +23,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_ELF) #if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF)
#ifndef MAX #ifndef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b))
@ -101,7 +101,7 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
else else
addr = simple_strtoul (argv[1], NULL, 16); addr = simple_strtoul (argv[1], NULL, 16);
#if (CONFIG_COMMANDS & CFG_CMD_NET) #if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
/* Check to see if we need to tftp the image ourselves before starting */ /* Check to see if we need to tftp the image ourselves before starting */
if ((argc == 2) && (strcmp (argv[1], "tftp") == 0)) { if ((argc == 2) && (strcmp (argv[1], "tftp") == 0)) {

4
common/cmd_ext2.c
View File

@ -35,14 +35,14 @@
#include <common.h> #include <common.h>
#include <part.h> #include <part.h>
#if (CONFIG_COMMANDS & CFG_CMD_EXT2) #if (CONFIG_COMMANDS & CFG_CMD_EXT2) || defined(CONFIG_CMD_EXT2)
#include <config.h> #include <config.h>
#include <command.h> #include <command.h>
#include <image.h> #include <image.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <ext2fs.h> #include <ext2fs.h>
#if ((CONFIG_COMMANDS & CFG_CMD_USB) && defined(CONFIG_USB_STORAGE)) #if (((CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB)) && defined(CONFIG_USB_STORAGE))
#include <usb.h> #include <usb.h>
#endif #endif

2
common/cmd_fat.c
View File

@ -31,7 +31,7 @@
#include <ata.h> #include <ata.h>
#include <part.h> #include <part.h>
#if (CONFIG_COMMANDS & CFG_CMD_FAT) #if (CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT)
#undef DEBUG #undef DEBUG

11
common/cmd_fdc.c
View File

@ -47,11 +47,12 @@
#endif #endif
/*#if (CONFIG_COMMANDS & CFG_CMD_DATE) */ /*#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE) */
/*#include <rtc.h> */ /*#include <rtc.h> */
/*#endif */ /*#endif */
#if ((CONFIG_COMMANDS & CFG_CMD_FDC) || (CONFIG_COMMANDS & CFG_CMD_FDOS)) #if (CONFIG_COMMANDS & CFG_CMD_FDC) || defined(CONFIG_CMD_FDC) \
|| (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
typedef struct { typedef struct {
@ -709,7 +710,7 @@ int fdc_setup(int drive, FDC_COMMAND_STRUCT *pCMD, FD_GEO_STRUCT *pFG)
} }
#endif /* ((CONFIG_COMMANDS & CFG_CMD_FDC)||(CONFIG_COMMANDS & CFG_CMD_FDOS))*/ #endif /* ((CONFIG_COMMANDS & CFG_CMD_FDC)||(CONFIG_COMMANDS & CFG_CMD_FDOS))*/
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) #if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
/* Low level functions for the Floppy-DOS layer */ /* Low level functions for the Floppy-DOS layer */
@ -774,7 +775,7 @@ int fdc_fdos_read (void *buffer, int len)
} }
#endif /* (CONFIG_COMMANDS & CFG_CMD_FDOS) */ #endif /* (CONFIG_COMMANDS & CFG_CMD_FDOS) */
#if (CONFIG_COMMANDS & CFG_CMD_FDC) #if (CONFIG_COMMANDS & CFG_CMD_FDC) || defined(CONFIG_CMD_FDC)
/**************************************************************************** /****************************************************************************
* main routine do_fdcboot * main routine do_fdcboot
*/ */
@ -886,7 +887,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
/***************************************************/ /***************************************************/
#if (CONFIG_COMMANDS & CFG_CMD_FDC) #if (CONFIG_COMMANDS & CFG_CMD_FDC) || defined(CONFIG_CMD_FDC)
U_BOOT_CMD( U_BOOT_CMD(
fdcboot, 3, 1, do_fdcboot, fdcboot, 3, 1, do_fdcboot,

2
common/cmd_fdos.c
View File

@ -31,7 +31,7 @@
#include <command.h> #include <command.h>
#include <fdc.h> #include <fdc.h>
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) #if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* do_fdosboot -- * do_fdosboot --

14
common/cmd_flash.c
View File

@ -31,9 +31,9 @@
#include <dataflash.h> #include <dataflash.h>
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_FLASH) #if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH)
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) #if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
/* parition handling routines */ /* parition handling routines */
@ -311,7 +311,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
flash_info_t *info; flash_info_t *info;
ulong bank, addr_first, addr_last; ulong bank, addr_first, addr_last;
int n, sect_first, sect_last; int n, sect_first, sect_last;
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) #if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
struct mtd_device *dev; struct mtd_device *dev;
struct part_info *part; struct part_info *part;
u8 dev_type, dev_num, pnum; u8 dev_type, dev_num, pnum;
@ -343,7 +343,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return rcode; return rcode;
} }
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) #if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
/* erase <part-id> - erase partition */ /* erase <part-id> - erase partition */
if ((argc == 2) && (id_parse(argv[1], NULL, &dev_type, &dev_num) == 0)) { if ((argc == 2) && (id_parse(argv[1], NULL, &dev_type, &dev_num) == 0)) {
mtdparts_init(); mtdparts_init();
@ -447,7 +447,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
flash_info_t *info; flash_info_t *info;
ulong bank, addr_first, addr_last; ulong bank, addr_first, addr_last;
int i, p, n, sect_first, sect_last; int i, p, n, sect_first, sect_last;
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) #if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
struct mtd_device *dev; struct mtd_device *dev;
struct part_info *part; struct part_info *part;
u8 dev_type, dev_num, pnum; u8 dev_type, dev_num, pnum;
@ -539,7 +539,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return rcode; return rcode;
} }
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) #if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
/* protect on/off <part-id> */ /* protect on/off <part-id> */
if ((argc == 3) && (id_parse(argv[2], NULL, &dev_type, &dev_num) == 0)) { if ((argc == 3) && (id_parse(argv[2], NULL, &dev_type, &dev_num) == 0)) {
mtdparts_init(); mtdparts_init();
@ -672,7 +672,7 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last)
/**************************************************/ /**************************************************/
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) #if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
# define TMP_ERASE "erase <part-id>\n - erase partition\n" # define TMP_ERASE "erase <part-id>\n - erase partition\n"
# define TMP_PROT_ON "protect on <part-id>\n - protect partition\n" # define TMP_PROT_ON "protect on <part-id>\n - protect partition\n"
# define TMP_PROT_OFF "protect off <part-id>\n - make partition writable\n" # define TMP_PROT_OFF "protect off <part-id>\n - make partition writable\n"

4
common/cmd_fpga.c
View File

@ -27,7 +27,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#if (CONFIG_COMMANDS & CFG_CMD_NET) #if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
#include <net.h> #include <net.h>
#endif #endif
#include <fpga.h> #include <fpga.h>
@ -43,7 +43,7 @@
#define PRINTF(fmt,args...) #define PRINTF(fmt,args...)
#endif #endif
#if defined (CONFIG_FPGA) && ( CONFIG_COMMANDS & CFG_CMD_FPGA ) #if defined (CONFIG_FPGA) && ((CONFIG_COMMANDS & CFG_CMD_FPGA ) || defined(CONFIG_CMD_FPGA))
/* Local functions */ /* Local functions */
static void fpga_usage (cmd_tbl_t * cmdtp); static void fpga_usage (cmd_tbl_t * cmdtp);