@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR;
/*cmd_boot.c*/
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>
# endif
@ -89,11 +89,11 @@ int gunzip (void *, int, unsigned char *, unsigned long *);
static void * zalloc ( void * , unsigned , 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 ) ;
# endif
# if (CONFIG_COMMANDS & CFG_CMD_IMLS)
# if (CONFIG_COMMANDS & CFG_CMD_IMLS) || defined(CONFIG_CMD_IMLS)
# include <flash.h>
extern flash_info_t flash_info [ ] ; /* info for FLASH chips */
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
static boot_os_Fcn do_bootm_netbsd ;
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_qnxelf ;
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 ) ;
break ;
# if (CONFIG_COMMANDS & CFG_CMD_ELF)
# if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF)
case IH_OS_VXWORKS :
do_bootm_vxworks ( cmdtp , flag , argc , argv ,
addr , len_ptr , verify ) ;
@ -1219,7 +1219,7 @@ do_bootm_artos (cmd_tbl_t *cmdtp, int flag,
# 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 rcode = 0 ;
@ -1247,7 +1247,7 @@ U_BOOT_CMD(
# 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 arg ;
@ -1317,7 +1317,7 @@ U_BOOT_CMD(
# 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 .
*/
@ -1378,13 +1378,13 @@ U_BOOT_CMD(
void
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 ) ;
struct rtc_time tm ;
# endif
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 ) ;
printf ( " Created: %4d-%02d-%02d %2d:%02d:%02d UTC \n " ,
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 ) ;
}
# if (CONFIG_COMMANDS & CFG_CMD_ELF)
# if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF)
static void
do_bootm_vxworks ( cmd_tbl_t * cmdtp , int flag , int argc , char * argv [ ] ,
ulong addr , ulong * len_ptr , int verify )