1
0
Fork 0

Fix problems with SNTP support;

enable SNTP support in some boards.
utp
wdenk 2005-04-02 22:37:54 +00:00
parent be6b6e4e2d
commit 414eec35e3
61 changed files with 480 additions and 376 deletions

View File

@ -2,6 +2,9 @@
Changes for U-Boot 1.1.3: Changes for U-Boot 1.1.3:
====================================================================== ======================================================================
* Fix problems with SNTP support;
enable SNTP support in some boards.
* Patches by Martin Krause, 01 Apr 2005: * Patches by Martin Krause, 01 Apr 2005:
- Fix flash erase timeout on CMC_PU2 - Fix flash erase timeout on CMC_PU2
- Add automatic HW detection for CMC_PU2 and CMC_BASIC - Add automatic HW detection for CMC_PU2 and CMC_BASIC

View File

@ -1,5 +1,3 @@
indent: Standard input:49: Warning:old style assignment ambiguity in "=*". Assuming "= *"
/* /*
* (C) Copyright 2001 * (C) Copyright 2001
* *

View File

@ -137,13 +137,13 @@ static void netboot_update_env (void)
if (NetOurNISDomain[0]) if (NetOurNISDomain[0])
setenv ("domain", NetOurNISDomain); setenv ("domain", NetOurNISDomain);
#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET) #if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET)
if (NetTimeOffset) { if (NetTimeOffset) {
sprintf (tmp, "%d", NetTimeOffset); sprintf (tmp, "%d", NetTimeOffset);
setenv ("timeoffset", tmp); setenv ("timeoffset", tmp);
} }
#endif #endif
#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_NTPSERVER) #if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_NTPSERVER)
if (NetNtpServerIP) { if (NetNtpServerIP) {
ip_to_string (NetNtpServerIP, tmp); ip_to_string (NetNtpServerIP, tmp);
setenv ("ntpserverip", tmp); setenv ("ntpserverip", tmp);

View File

@ -27,6 +27,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <asm/byteorder.h>
#if (CONFIG_COMMANDS & CFG_CMD_USB) #if (CONFIG_COMMANDS & CFG_CMD_USB)

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -47,8 +47,6 @@
#define MPC8XX_XIN 5000000 /* 5 MHz in */ #define MPC8XX_XIN 5000000 /* 5 MHz in */
#define MPC8XX_HZ ((MPC8XX_XIN) * (MPC8XX_FACT)) #define MPC8XX_HZ ((MPC8XX_XIN) * (MPC8XX_FACT))
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#if 0 #if 0
#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ #define CONFIG_BOOTDELAY -1 /* autoboot disabled */
#else #else
@ -80,7 +78,9 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_DATE ) CFG_CMD_DATE | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)

View File

@ -58,44 +58,30 @@
#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
/* /*
* Supported commands * Supported commands
*/ */
/* CONFIG_CMD_DFL includes CFG_CMD_BDI (bdinfo), CFG_CMD_LOADS (loads), #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_LOADB (loadb), CFG_CMD_IMI (iminfo), CFG_CMD_FLASH CFG_CMD_BOOTD | \
(flinfo, erase, protect), CFG_CMD_MEMORY (md, mm, nm, mw, cp, cmp, CFG_CMD_CACHE | \
crc, base, loop, mtest), CFG_CMD_ENV (printenv, setenv, saveenv), CFG_CMD_DHCP | \
CFG_CMD_BOOTD (bootd), CFG_CMD_CONSOLE (coninfo), CFG_CMD_NET (bootp, CFG_CMD_DIAG | \
tftpboot, rarpboot), CFG_CMD_RUN, CFG_CMD_MISC (sleep, etc), CFG_CMD_EEPROM | \
CFG_CMD_BSP, CFG_CMD_IMLS, CFG_CMD_FPGA */ CFG_CMD_ELF | \
CFG_CMD_I2C | \
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ CFG_CMD_NET | \
CFG_CMD_BOOTD | \ CFG_CMD_NFS | \
CFG_CMD_CACHE | \ CFG_CMD_PING | \
CFG_CMD_DIAG | \ CFG_CMD_PCI | \
CFG_CMD_EEPROM | \ CFG_CMD_REGINFO | \
CFG_CMD_ELF | \ CFG_CMD_SDRAM | \
CFG_CMD_I2C | \ CFG_CMD_SNTP )
CFG_CMD_NET | \
CFG_CMD_PING | \
CFG_CMD_REGINFO | \
CFG_CMD_SDRAM \
)
/* CFG_CMD_DHCP | \ */
/* CFG_CMD_MII | \ */
/* CFG_CMD_PCI | \ */
/* CFG_CMD_USB */
# define CONFIG_NET_MULTI
/*#if (CONFIG_COMMANDS & CFG_CMD_NET)
# define CONFIG_NET_MULTI
#else
# undef CONFIG_NET_MULTI
#endif*/
#define CONFIG_NET_MULTI
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,7 +1,7 @@
/* /*
* ueberarbeitet durch Christoph Seyfert * ueberarbeitet durch Christoph Seyfert
* *
* (C) Copyright 2004 DENX Software Engineering, * (C) Copyright 2004-2005 DENX Software Engineering,
* Wolfgang Grandegger <wg@denx.de> * Wolfgang Grandegger <wg@denx.de>
* (C) Copyright 2003 * (C) Copyright 2003
* DAVE Srl * DAVE Srl
@ -117,14 +117,19 @@
#endif #endif
#define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ #define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_DHCP | \
CFG_CMD_ELF | \ CFG_CMD_ELF | \
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_I2C | \ CFG_CMD_I2C | \
CFG_CMD_IRQ | \ CFG_CMD_IRQ | \
CFG_CMD_JFFS2 | \ CFG_CMD_JFFS2 | \
CFG_CMD_MII | \ CFG_CMD_MII | \
CFG_CMD_NAND ) CFG_CMD_NAND | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -46,7 +46,6 @@
#define CONFIG_BAUDRATE 19200 /* console baudrate in bps */ #define CONFIG_BAUDRATE 19200 /* console baudrate in bps */
#define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */ #define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_IPADDR 192.168.0.42 #define CONFIG_IPADDR 192.168.0.42
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_NETMASK 255.255.255.0
@ -98,10 +97,12 @@
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_BSP | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_BSP ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001-2003 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -69,7 +69,8 @@
CFG_CMD_NFS | \ CFG_CMD_NFS | \
CFG_CMD_PCI | \ CFG_CMD_PCI | \
CFG_CMD_PING | \ CFG_CMD_PING | \
CFG_CMD_SDRAM ) CFG_CMD_SDRAM | \
CFG_CMD_SNTP )
/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) /* This must be included AFTER the definition of CONFIG_COMMANDS (if any)
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -109,8 +109,6 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_PREBOOT \ #define CONFIG_PREBOOT \
"echo; " \ "echo; " \
"echo Type \"run flash_nfs\" to mount root filesystem over NFS; " \ "echo Type \"run flash_nfs\" to mount root filesystem over NFS; " \
@ -166,12 +164,15 @@
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_BEDBUG | \ CFG_CMD_BEDBUG | \
CFG_CMD_EEPROM | \ CFG_CMD_DATE | \
CFG_CMD_DATE | \ CFG_CMD_DHCP | \
CFG_CMD_I2C | \ CFG_CMD_DOC | \
CFG_CMD_DOC ) CFG_CMD_EEPROM | \
CFG_CMD_I2C | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -50,8 +50,6 @@
#define CONFIG_BAUDRATE 9600 #define CONFIG_BAUDRATE 9600
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
#define CONFIG_BOOTCOMMAND "bootm FE020000" /* autoboot command */ #define CONFIG_BOOTCOMMAND "bootm FE020000" /* autoboot command */
@ -59,11 +57,15 @@
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_BEDBUG | \ CFG_CMD_BEDBUG | \
0 /* CFG_CMD_DATE */ | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_PCI | \ CFG_CMD_PCI | \
0 /* CFG_CMD_DATE */ ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) /* This must be included AFTER the definition of CONFIG_COMMANDS (if any)
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -47,8 +47,6 @@
#endif #endif
#define CONFIG_BOOTCOMMAND "bootm 40040000" /* autoboot command */ #define CONFIG_BOOTCOMMAND "bootm 40040000" /* autoboot command */
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_BOARD_TYPES 1 /* support board types */ #define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_BOOTARGS "root=/dev/nfs rw " \ #define CONFIG_BOOTARGS "root=/dev/nfs rw " \
@ -66,8 +64,10 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2003 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -133,7 +133,9 @@
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_FAT | \ CFG_CMD_FAT | \
CFG_CMD_I2C | \ CFG_CMD_I2C | \
CFG_CMD_IDE ) CFG_CMD_IDE | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#else #else
# define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ # define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
@ -141,7 +143,9 @@
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_FAT | \ CFG_CMD_FAT | \
CFG_CMD_I2C | \ CFG_CMD_I2C | \
CFG_CMD_IDE ) CFG_CMD_IDE | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#endif #endif
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001-2002 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -62,8 +62,6 @@
#endif #endif
#endif #endif
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#if 0 #if 0
#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ #define CONFIG_BOOTDELAY -1 /* autoboot disabled */
#else #else
@ -126,11 +124,13 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_I2C | \ CFG_CMD_I2C | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2004 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -41,8 +41,6 @@
#define CONFIG_BAUDRATE 9600 #define CONFIG_BAUDRATE 9600
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" \ #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" \
"\0load=tftp \"/tftpboot/u-boot.bin\"\0update=protect off 1:0;era 1:0;cp.b 100000 10000000 $(filesize)\0" "\0load=tftp \"/tftpboot/u-boot.bin\"\0update=protect off 1:0;era 1:0;cp.b 100000 10000000 $(filesize)\0"
@ -88,10 +86,14 @@
#define CFG_EEPROM_PAGE_WRITE_BITS 4 #define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* takes up to 10 msec */ #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* takes up to 10 msec */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_TIMESTAMP /* Print image info with timestamp */
CFG_CMD_BEDBUG | \
CFG_CMD_I2C | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_EEPROM) CFG_CMD_BEDBUG | \
CFG_CMD_I2C | \
CFG_CMD_EEPROM | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2003-2004 * (C) Copyright 2003-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -97,16 +97,20 @@
#define ADD_USB_CMD 0 #define ADD_USB_CMD 0
#endif #endif
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
/* /*
* Supported commands * Supported commands
*/ */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_FAT | \ CFG_CMD_FAT | \
CFG_CMD_I2C | \ CFG_CMD_I2C | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
ADD_PCI_CMD | \ CFG_CMD_NFS | \
ADD_USB_CMD) CFG_CMD_SNTP | \
ADD_PCI_CMD | \
ADD_USB_CMD )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2004 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* Klaus Heydeck, Kieback & Peter GmbH & Co KG, heydeck@kieback-peter.de * Klaus Heydeck, Kieback & Peter GmbH & Co KG, heydeck@kieback-peter.de
* *
@ -48,8 +48,6 @@
#define CONFIG_BOOTDELAY 1 /* autoboot after 1 second */ #define CONFIG_BOOTDELAY 1 /* autoboot after 1 second */
#endif #endif
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_BOARD_TYPES 1 /* support board types */ #define CONFIG_BOARD_TYPES 1 /* support board types */
@ -166,11 +164,13 @@
#endif #endif
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_I2C | \ CFG_CMD_I2C | \
CFG_CMD_DATE | \ CFG_CMD_IDE | \
CFG_CMD_NFS | \
CFG_CMD_POST_DIAG | \ CFG_CMD_POST_DIAG | \
CFG_CMD_IDE ) CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2004 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* Klaus Heydeck, Kieback & Peter GmbH & Co KG, heydeck@kieback-peter.de * Klaus Heydeck, Kieback & Peter GmbH & Co KG, heydeck@kieback-peter.de
* *
@ -48,8 +48,6 @@
#define CONFIG_BOOTDELAY 1 /* autoboot after 1 second */ #define CONFIG_BOOTDELAY 1 /* autoboot after 1 second */
#endif #endif
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_BOARD_TYPES 1 /* support board types */ #define CONFIG_BOARD_TYPES 1 /* support board types */
#define CFG_8XX_FACT 8 /* Multiply by 8 */ #define CFG_8XX_FACT 8 /* Multiply by 8 */
@ -177,13 +175,15 @@
#endif #endif
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_DHCP | \
CFG_CMD_I2C | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_POST_DIAG | \ CFG_CMD_DHCP | \
CFG_CMD_FAT | \
CFG_CMD_I2C | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_USB | \ CFG_CMD_NFS | \
CFG_CMD_FAT) CFG_CMD_POST_DIAG | \
CFG_CMD_SNTP | \
CFG_CMD_USB )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -177,32 +177,33 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CFG_EXCLUDE CFG_CMD_BEDBUG | \ #define CFG_EXCLUDE CFG_CMD_BEDBUG | \
CFG_CMD_BMP | \ CFG_CMD_BMP | \
CFG_CMD_BSP | \ CFG_CMD_BSP | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DOC | \ CFG_CMD_DOC | \
CFG_CMD_DTT | \ CFG_CMD_DTT | \
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_ELF | \ CFG_CMD_ELF | \
CFG_CMD_EXT2 | \ CFG_CMD_EXT2 | \
CFG_CMD_FAT | \ CFG_CMD_FAT | \
CFG_CMD_FDC | \ CFG_CMD_FDC | \
CFG_CMD_FDOS | \ CFG_CMD_FDOS | \
CFG_CMD_HWFLOW | \ CFG_CMD_HWFLOW | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_KGDB | \ CFG_CMD_KGDB | \
CFG_CMD_MMC | \ CFG_CMD_MMC | \
CFG_CMD_NAND | \ CFG_CMD_NAND | \
CFG_CMD_PCI | \ CFG_CMD_PCI | \
CFG_CMD_PCMCIA | \ CFG_CMD_PCMCIA | \
CFG_CMD_REISER | \ CFG_CMD_REISER | \
CFG_CMD_SCSI | \ CFG_CMD_SCSI | \
CFG_CMD_SPI | \ CFG_CMD_SPI | \
CFG_CMD_UNIVERSE | \ CFG_CMD_SNTP | \
CFG_CMD_USB | \ CFG_CMD_UNIVERSE | \
CFG_CMD_VFD | \ CFG_CMD_USB | \
CFG_CMD_XIMG CFG_CMD_VFD | \
CFG_CMD_XIMG
#if CONFIG_ADSTYPE >= CFG_PQ2FADS #if CONFIG_ADSTYPE >= CFG_PQ2FADS
#define CONFIG_COMMANDS (CFG_CMD_ALL & ~( \ #define CONFIG_COMMANDS (CFG_CMD_ALL & ~( \

View File

@ -145,33 +145,34 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_COMMANDS (CFG_CMD_ALL & ~( \ #define CONFIG_COMMANDS ( CFG_CMD_ALL & ~( \
CFG_CMD_BEDBUG | \ CFG_CMD_BEDBUG | \
CFG_CMD_BMP | \ CFG_CMD_BMP | \
CFG_CMD_BSP | \ CFG_CMD_BSP | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_DOC | \ CFG_CMD_DOC | \
CFG_CMD_DTT | \ CFG_CMD_DTT | \
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_ELF | \ CFG_CMD_ELF | \
CFG_CMD_EXT2 | \ CFG_CMD_EXT2 | \
CFG_CMD_FDC | \ CFG_CMD_FDC | \
CFG_CMD_FDOS | \ CFG_CMD_FDOS | \
CFG_CMD_HWFLOW | \ CFG_CMD_HWFLOW | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_JFFS2 | \ CFG_CMD_JFFS2 | \
CFG_CMD_KGDB | \ CFG_CMD_KGDB | \
CFG_CMD_MMC | \ CFG_CMD_MMC | \
CFG_CMD_NAND | \ CFG_CMD_NAND | \
CFG_CMD_PCMCIA | \ CFG_CMD_PCMCIA | \
CFG_CMD_REISER | \ CFG_CMD_REISER | \
CFG_CMD_SCSI | \ CFG_CMD_SCSI | \
CFG_CMD_SPI | \ CFG_CMD_SPI | \
CFG_CMD_VFD | \ CFG_CMD_SNTP | \
CFG_CMD_UNIVERSE | \ CFG_CMD_VFD | \
CFG_CMD_USB | \ CFG_CMD_UNIVERSE | \
CFG_CMD_XIMG ) ) CFG_CMD_USB | \
CFG_CMD_XIMG ) )
/* Define a command string that is automatically executed when no character /* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset. * is read on the console interface withing "Boot Delay" after reset.

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2004 * (C) Copyright 2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -118,10 +118,12 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_I2C | \ CFG_CMD_I2C | \
CFG_CMD_NAND | \ CFG_CMD_NAND | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2003 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -95,9 +95,11 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -164,18 +164,20 @@
#define CONFIG_SERVERIP 10.1.2.2 #define CONFIG_SERVERIP 10.1.2.2
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_PCI | \
CFG_CMD_IRQ | \
CFG_CMD_I2C | \
CFG_CMD_KGDB | \
CFG_CMD_DHCP | \
CFG_CMD_DATE | \
CFG_CMD_BEDBUG | \ CFG_CMD_BEDBUG | \
CFG_CMD_PING | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_DIAG | \ CFG_CMD_DIAG | \
CFG_CMD_ELF | \
CFG_CMD_I2C | \
CFG_CMD_IRQ | \
CFG_CMD_KGDB | \
CFG_CMD_MII | \ CFG_CMD_MII | \
CFG_CMD_NET | \ CFG_CMD_NET | \
CFG_CMD_ELF ) CFG_CMD_NFS | \
CFG_CMD_PCI | \
CFG_CMD_PING | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2002 * (C) Copyright 2002-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -50,8 +50,6 @@
#define CONFIG_BAUDRATE 9600 #define CONFIG_BAUDRATE 9600
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passed to Linux in MHz */
#define CONFIG_PREBOOT "" #define CONFIG_PREBOOT ""
#define CONFIG_BOOTDELAY 5 #define CONFIG_BOOTDELAY 5
@ -61,14 +59,16 @@
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_BSP | \ CFG_CMD_BSP | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_DOC | \ CFG_CMD_DOC | \
CFG_CMD_ELF | \ CFG_CMD_ELF | \
CFG_CMD_PCI ) CFG_CMD_NFS | \
CFG_CMD_PCI | \
CFG_CMD_SNTP )
#define CONFIG_PCI 1 #define CONFIG_PCI 1
#define CONFIG_PCI_PNP 1 /* PCI plug-and-play */ #define CONFIG_PCI_PNP 1 /* PCI plug-and-play */

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2002 * (C) Copyright 2002-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -50,8 +50,6 @@
#define CONFIG_BAUDRATE 9600 #define CONFIG_BAUDRATE 9600
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passed to Linux in MHz */
#define CONFIG_PREBOOT "" #define CONFIG_PREBOOT ""
#define CONFIG_BOOTDELAY 5 #define CONFIG_BOOTDELAY 5
@ -61,15 +59,17 @@
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_BSP | \ CFG_CMD_BSP | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_DOC | \ CFG_CMD_DOC | \
CFG_CMD_ELF | \ CFG_CMD_ELF | \
CFG_CMD_PCI | \ CFG_CMD_NFS | \
CFG_CMD_SCSI ) CFG_CMD_PCI | \
CFG_CMD_SCSI | \
CFG_CMD_SNTP )
#define CONFIG_PCI 1 #define CONFIG_PCI 1

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2003-2004 * (C) Copyright 2003-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -105,16 +105,19 @@
/* /*
* Supported commands * Supported commands
*/ */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_EEPROM | \ ADD_DOC_CMD | \
CFG_CMD_FAT | \ ADD_PCI_CMD | \
CFG_CMD_I2C | \ ADD_USB_CMD | \
CFG_CMD_IDE | \ CFG_CMD_BEDBUG | \
ADD_DOC_CMD | \ CFG_CMD_DATE | \
ADD_PCI_CMD | \ CFG_CMD_DHCP | \
CFG_CMD_DATE | \ CFG_CMD_EEPROM | \
CFG_CMD_BEDBUG | \ CFG_CMD_FAT | \
ADD_USB_CMD) CFG_CMD_I2C | \
CFG_CMD_IDE | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001-2004 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -40,8 +40,6 @@
#undef CONFIG_DB_CR826_J30x_ON /* J30x jumpers on D.B. carrier */ #undef CONFIG_DB_CR826_J30x_ON /* J30x jumpers on D.B. carrier */
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
@ -156,20 +154,26 @@
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_BEDBUG | \ CFG_CMD_BEDBUG | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DOC | \ CFG_CMD_DHCP | \
CFG_CMD_EEPROM | \ CFG_CMD_DOC | \
CFG_CMD_I2C | \ CFG_CMD_EEPROM | \
CFG_CMD_PCI) CFG_CMD_I2C | \
CFG_CMD_NFS | \
CFG_CMD_PCI | \
CFG_CMD_SNTP )
#else /* ! PCI */ #else /* ! PCI */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_BEDBUG | \ CFG_CMD_BEDBUG | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DOC | \ CFG_CMD_DHCP | \
CFG_CMD_EEPROM | \ CFG_CMD_DOC | \
CFG_CMD_I2C ) CFG_CMD_EEPROM | \
CFG_CMD_I2C | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001-2004 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -40,8 +40,6 @@
#undef CONFIG_DB_CR826_J30x_ON /* J30x jumpers on D.B. carrier */ #undef CONFIG_DB_CR826_J30x_ON /* J30x jumpers on D.B. carrier */
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
@ -156,20 +154,26 @@
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_BEDBUG | \ CFG_CMD_BEDBUG | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DOC | \ CFG_CMD_DHCP | \
CFG_CMD_EEPROM | \ CFG_CMD_DOC | \
CFG_CMD_I2C | \ CFG_CMD_EEPROM | \
CFG_CMD_PCI) CFG_CMD_I2C | \
CFG_CMD_NFS | \
CFG_CMD_PCI | \
CFG_CMD_SNTP )
#else /* ! PCI */ #else /* ! PCI */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_BEDBUG | \ CFG_CMD_BEDBUG | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DOC | \ CFG_CMD_DHCP | \
CFG_CMD_EEPROM | \ CFG_CMD_DOC | \
CFG_CMD_I2C ) CFG_CMD_EEPROM | \
CFG_CMD_I2C | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */

View File

@ -1,4 +1,7 @@
/* /*
* (C) Copyright 2003-2005
* Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
*
* (C) Copyright 2003 * (C) Copyright 2003
* DAVE Srl * DAVE Srl
* *
@ -112,6 +115,7 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_ELF | \ CFG_CMD_ELF | \
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_I2C | \ CFG_CMD_I2C | \
@ -119,7 +123,9 @@
CFG_CMD_JFFS2 | \ CFG_CMD_JFFS2 | \
CFG_CMD_MII | \ CFG_CMD_MII | \
CFG_CMD_NAND | \ CFG_CMD_NAND | \
CFG_CMD_PCI ) CFG_CMD_NFS | \
CFG_CMD_PCI | \
CFG_CMD_SNTP )
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2002 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -113,13 +113,15 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_BMP | \ CFG_CMD_BMP | \
CFG_CMD_DHCP | \ CFG_CMD_BSP | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_I2C | \ CFG_CMD_I2C | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_JFFS2 | \ CFG_CMD_JFFS2 | \
CFG_CMD_NFS | \
CFG_CMD_PCMCIA | \ CFG_CMD_PCMCIA | \
CFG_CMD_BSP ) CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -113,6 +113,7 @@
~CFG_CMD_REISER & \ ~CFG_CMD_REISER & \
~CFG_CMD_SCSI & \ ~CFG_CMD_SCSI & \
~CFG_CMD_SETGETDCR & \ ~CFG_CMD_SETGETDCR & \
~CFG_CMD_SNTP & \
~CFG_CMD_SPI & \ ~CFG_CMD_SPI & \
~CFG_CMD_UNIVERSE & \ ~CFG_CMD_UNIVERSE & \
~CFG_CMD_USB & \ ~CFG_CMD_USB & \

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -80,12 +80,15 @@
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"
#define CONFIG_COMMANDS ( (CONFIG_CMD_DFL & ~CFG_CMD_AUTOSCRIPT) | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_ELF | \ CFG_CMD_DHCP | \
CFG_CMD_I2C | \ CFG_CMD_ELF | \
CFG_CMD_SDRAM | \ CFG_CMD_I2C | \
CFG_CMD_EEPROM | \ CFG_CMD_SDRAM | \
CFG_CMD_PCI ) CFG_CMD_EEPROM | \
CFG_CMD_NFS | \
CFG_CMD_PCI | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001, 2002 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -49,11 +49,16 @@
#define CONFIG_BAUDRATE 9600 #define CONFIG_BAUDRATE 9600
#define CONFIG_DRAM_SPEED 100 /* MHz */ #define CONFIG_DRAM_SPEED 100 /* MHz */
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_TIMESTAMP /* Print image info with timestamp */
CFG_CMD_ELF | \
CFG_CMD_I2C | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_EEPROM | \ CFG_CMD_DHCP | \
CFG_CMD_PCI ) CFG_CMD_ELF | \
CFG_CMD_I2C | \
CFG_CMD_EEPROM | \
CFG_CMD_NFS | \
CFG_CMD_PCI | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -165,9 +165,11 @@
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_I2C | \ CFG_CMD_I2C | \
CFG_CMD_MII | \ CFG_CMD_MII | \
CFG_CMD_NFS | \
CFG_CMD_PING | \ CFG_CMD_PING | \
CFG_CMD_POST_DIAG | \ CFG_CMD_POST_DIAG | \
CFG_CMD_REGINFO ) CFG_CMD_REGINFO | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2003 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -101,13 +101,17 @@
CFG_CMD_BMP | \ CFG_CMD_BMP | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_IDE ) CFG_CMD_IDE | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#else #else
# define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ # define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_IDE ) CFG_CMD_IDE | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#endif #endif
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2003 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -97,9 +97,11 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001-2003 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -216,11 +216,16 @@
#undef CONFIG_WATCHDOG /* watchdog disabled */ #undef CONFIG_WATCHDOG /* watchdog disabled */
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_I2C | \ CFG_CMD_DHCP | \
CFG_CMD_EEPROM) CFG_CMD_I2C | \
CFG_CMD_EEPROM | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2003 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -89,9 +89,11 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2003 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -87,9 +87,11 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2005 DENX Software Engineering * Copyright 2005 DENX Software Engineering
* Wolfgang Denk <wd@denx.de>
* Copyright 2004 Freescale Semiconductor. * Copyright 2004 Freescale Semiconductor.
* (C) Copyright 2002,2003 Motorola,Inc. * (C) Copyright 2002,2003 Motorola,Inc.
* Xianghua Xiao <X.Xiao@motorola.com> * Xianghua Xiao <X.Xiao@motorola.com>
@ -144,9 +145,6 @@
#define CFG_FLASH_CFI #define CFG_FLASH_CFI
#define CFG_FLASH_EMPTY_INFO #define CFG_FLASH_EMPTY_INFO
#undef CONFIG_CLOCKS_IN_MHZ
#define CFG_LBC_LCRR 0x00030008 /* LB clock ratio reg */ #define CFG_LBC_LCRR 0x00030008 /* LB clock ratio reg */
#define CFG_LBC_LBCR 0x00000000 /* LB config reg */ #define CFG_LBC_LBCR 0x00000000 /* LB config reg */
#define CFG_LBC_LSRT 0x20000000 /* LB sdram refresh timer */ #define CFG_LBC_LSRT 0x20000000 /* LB sdram refresh timer */
@ -322,36 +320,27 @@
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#if defined(CFG_RAMBOOT) #if defined(CFG_RAMBOOT)
#if defined(CONFIG_PCI) # define CONFIG_CMD_PRIV (CONFIG_CMD_DFL & ~(CFG_CMD_ENV | CFG_CMD_LOADS))
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL \
| CFG_CMD_PING \
| CFG_CMD_PCI \
| CFG_CMD_I2C) \
& \
~(CFG_CMD_ENV \
| CFG_CMD_LOADS))
#else
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL \
| CFG_CMD_PING \
| CFG_CMD_I2C) \
& \
~(CFG_CMD_ENV \
| CFG_CMD_LOADS))
#endif
#else #else
#if defined(CONFIG_PCI) # define CONFIG_CMD_PRIV (CONFIG_CMD_DFL | \
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ CFG_CMD_DHCP | \
| CFG_CMD_PCI \ CFG_CMD_NFS | \
| CFG_CMD_PING \ CFG_CMD_SNTP )
| CFG_CMD_I2C)
#else
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
| CFG_CMD_PING \
| CFG_CMD_I2C)
#endif
#endif #endif
#if defined(CONFIG_PCI)
# define ADD_PCI_CMD (CFG_CMD_PCI)
#else
# define ADD_PCI_CMD 0
#endif
#define CONFIG_COMMANDS (CONFIG_CMD_PRIV | \
ADD_PCI_CMD | \
CFG_CMD_PING | \
CFG_CMD_I2C )
#include <cmd_confdefs.h> #include <cmd_confdefs.h>
#undef CONFIG_WATCHDOG /* watchdog disabled */ #undef CONFIG_WATCHDOG /* watchdog disabled */

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2003 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -92,9 +92,11 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2004 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -125,10 +125,12 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2003 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -96,6 +96,7 @@
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_ELF | \ CFG_CMD_ELF | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_NFS | \
CFG_CMD_SNTP ) CFG_CMD_SNTP )
#define CONFIG_NETCONSOLE #define CONFIG_NETCONSOLE

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2003 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -92,10 +92,12 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_ELF | \ CFG_CMD_ELF | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2003 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -95,9 +95,11 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2003 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -95,9 +95,11 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2004 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -136,10 +136,13 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_I2C | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_I2C ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -78,9 +78,11 @@
#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_DATE ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -1,5 +1,5 @@
/* /*
* Gary Jennejohn <garyj@denx.de> * 2004-2005 Gary Jennejohn <garyj@denx.de>
* *
* Configuration settings for the CMC PU2 board. * Configuration settings for the CMC PU2 board.
* *
@ -126,15 +126,19 @@
#ifdef CONFIG_HARD_I2C #ifdef CONFIG_HARD_I2C
#define CONFIG_COMMANDS \ #define CONFIG_COMMANDS \
((CONFIG_CMD_DFL | \ ((CONFIG_CMD_DFL | \
CFG_CMD_I2C | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_DHCP ) & \ CFG_CMD_I2C | \
CFG_CMD_NFS | \
CFG_CMD_SNTP ) & \
~(CFG_CMD_FPGA | CFG_CMD_MISC) ) ~(CFG_CMD_FPGA | CFG_CMD_MISC) )
#else #else
#define CONFIG_COMMANDS \ #define CONFIG_COMMANDS \
((CONFIG_CMD_DFL | \ ((CONFIG_CMD_DFL | \
CFG_CMD_DHCP ) & \ CFG_CMD_DHCP | \
CFG_CMD_NFS | \
CFG_CMD_SNTP ) & \
~(CFG_CMD_FPGA | CFG_CMD_MISC) ) ~(CFG_CMD_FPGA | CFG_CMD_MISC) )
#define CONFIG_TIMESTAMP #define CONFIG_TIMESTAMP
#endif #endif

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2003 * (C) Copyright 2003-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -81,12 +81,14 @@
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_ELF | \ CFG_CMD_ELF | \
CFG_CMD_JFFS2 | \ CFG_CMD_JFFS2 | \
CFG_CMD_PING ) CFG_CMD_NFS | \
CFG_CMD_PING | \
CFG_CMD_SNTP )
#include <cmd_confdefs.h> #include <cmd_confdefs.h>
/* /*

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2003-2004 * (C) Copyright 2003-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -80,10 +80,13 @@
* Supported commands * Supported commands
*/ */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_DHCP | \
CFG_CMD_EXT2 | \ CFG_CMD_EXT2 | \
CFG_CMD_FAT | \ CFG_CMD_FAT | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_NFS | \
CFG_CMD_PCI | \ CFG_CMD_PCI | \
CFG_CMD_SNTP | \
CFG_CMD_USB ) CFG_CMD_USB )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -176,15 +176,17 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DHCP | \ CFG_CMD_BMP | \
CFG_CMD_BSP | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_EEPROM | \
CFG_CMD_FAT | \ CFG_CMD_FAT | \
CFG_CMD_I2C | \ CFG_CMD_I2C | \
CFG_CMD_EEPROM | \
CFG_CMD_IDE | \ CFG_CMD_IDE | \
CFG_CMD_BSP | \ CFG_CMD_NFS | \
CFG_CMD_BMP | \ CFG_CMD_POST_DIAG | \
CFG_CMD_POST_DIAG ) CFG_CMD_SNTP )
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2001 * (C) Copyright 2001-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -90,9 +90,12 @@
#define CFG_SPI_INIT_OFFSET 0xB00 #define CFG_SPI_INIT_OFFSET 0xB00
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_BSP | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_EEPROM | \ CFG_CMD_EEPROM | \
CFG_CMD_BSP ) CFG_CMD_NFS | \
CFG_CMD_SNTP )
#define CONFIG_BOOTP_MASK \ #define CONFIG_BOOTP_MASK \
((CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) & ~CONFIG_BOOTP_GATEWAY) ((CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) & ~CONFIG_BOOTP_GATEWAY)

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2003 * (C) Copyright 2003-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -51,8 +51,6 @@
/* default developmenmt environment */ /* default developmenmt environment */
#undef CONFIG_CLOCKS_IN_MHZ /* clocks passed to Linux in MHz. Needed for old kernels (2.4) crashes for new kernels */
#define CONFIG_ETHADDR 00:0B:17:00:00:00 #define CONFIG_ETHADDR 00:0B:17:00:00:00
#define CONFIG_IPADDR 10.10.69.10 #define CONFIG_IPADDR 10.10.69.10
@ -97,8 +95,10 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_PING | \ CFG_CMD_NFS | \
CFG_CMD_REGINFO) CFG_CMD_PING | \
CFG_CMD_REGINFO | \
CFG_CMD_SNTP )
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2003 * (C) Copyright 2003-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -90,7 +90,9 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_DHCP | \ CFG_CMD_DHCP | \
CFG_CMD_I2C ) CFG_CMD_I2C | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)

View File

@ -1,4 +1,6 @@
/* /*
* (C) Copyright 2002-2005
* Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
* (C) Copyright 2002 * (C) Copyright 2002
* Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Marius Groeger <mgroeger@sysgo.de> * Marius Groeger <mgroeger@sysgo.de>
@ -91,10 +93,13 @@
#define CONFIG_RTC_S3C24X0 1 #define CONFIG_RTC_S3C24X0 1
#ifndef USE_920T_MMU #ifndef USE_920T_MMU
#define CONFIG_COMMANDS_tmp ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \ #define CONFIG_COMMANDS_tmp ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \
CFG_CMD_DATE) CFG_CMD_DATE | \
CFG_CMD_SNTP )
#else #else
#define CONFIG_COMMANDS_tmp (CONFIG_CMD_DFL | CFG_CMD_DATE) #define CONFIG_COMMANDS_tmp (CONFIG_CMD_DFL | \
CFG_CMD_DATE | \
CFG_CMD_SNTP )
#endif #endif
#ifdef CONFIG_HWFLOW #ifdef CONFIG_HWFLOW

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2002-2003 * (C) Copyright 2002-2005
* Gary Jennejohn <gj@denx.de> * Gary Jennejohn <gj@denx.de>
* *
* Configuation settings for the TRAB board. * Configuation settings for the TRAB board.
@ -157,25 +157,31 @@
#endif #endif
#ifndef USE_920T_MMU #ifndef USE_920T_MMU
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \ #define CONFIG_COMMANDS ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \
CFG_CMD_BSP | \ CONFIG_COMMANDS_ADD_HWFLOW | \
CFG_CMD_DATE | \ CONFIG_COMMANDS_ADD_VFD | \
CONFIG_COMMANDS_ADD_HWFLOW | \ CONFIG_COMMANDS_ADD_EEPROM | \
CONFIG_COMMANDS_ADD_VFD | \ CONFIG_COMMANDS_I2C | \
CONFIG_COMMANDS_ADD_EEPROM | \ CFG_CMD_BSP | \
CFG_CMD_USB | \ CFG_CMD_DATE | \
CFG_CMD_FAT | \ CFG_CMD_DHCP | \
CONFIG_COMMANDS_I2C ) CFG_CMD_USB | \
CFG_CMD_FAT | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#else #else
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_BSP | \ CONFIG_COMMANDS_ADD_HWFLOW | \
CFG_CMD_DATE | \ CONFIG_COMMANDS_ADD_VFD | \
CONFIG_COMMANDS_ADD_HWFLOW | \ CONFIG_COMMANDS_ADD_EEPROM | \
CONFIG_COMMANDS_ADD_VFD | \ CONFIG_COMMANDS_I2C | \
CONFIG_COMMANDS_ADD_EEPROM | \ CFG_CMD_BSP | \
CFG_CMD_USB | \ CFG_CMD_DATE | \
CFG_CMD_FAT | \ CFG_CMD_DHCP | \
CONFIG_COMMANDS_I2C ) CFG_CMD_USB | \
CFG_CMD_FAT | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
#endif #endif
/* moved up */ /* moved up */

View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000-2004 * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -125,16 +125,18 @@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ CFG_CMD_ASKENV | \
CFG_CMD_DHCP | \
CFG_CMD_ELF | \
CFG_CMD_IDE | \
CFG_CMD_FAT | \
CFG_CMD_MII | \
CFG_CMD_PING | \
CFG_CMD_I2C | \
CFG_CMD_EEPROM | \
CFG_CMD_DATE | \ CFG_CMD_DATE | \
CFG_CMD_POST_DIAG ) CFG_CMD_DHCP | \
CFG_CMD_EEPROM | \
CFG_CMD_ELF | \
CFG_CMD_FAT | \
CFG_CMD_I2C | \
CFG_CMD_IDE | \
CFG_CMD_MII | \
CFG_CMD_NFS | \
CFG_CMD_PING | \
CFG_CMD_POST_DIAG | \
CFG_CMD_SNTP )
#define CONFIG_NETCONSOLE #define CONFIG_NETCONSOLE

View File

@ -1,4 +1,7 @@
/* /*
* (C) Copyright 2004-2005
* Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
*
* (C) Copyright 2004 * (C) Copyright 2004
* Vincent Dubey, Xa SA, vincent.dubey@xa-ch.com * Vincent Dubey, Xa SA, vincent.dubey@xa-ch.com
* *
@ -65,11 +68,18 @@
/* allow to overwrite serial and ethaddr */ /* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OVERWRITE
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */ #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_DIAG | CFG_CMD_SDRAM) & ~CFG_CMD_DTT) #define CONFIG_COMMANDS ((CONFIG_CMD_DFL & ~CFG_CMD_DTT) | \
CFG_CMD_DHCP | \
CFG_CMD_DIAG | \
CFG_CMD_NFS | \
CFG_CMD_SDRAM | \
CFG_CMD_SNTP )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> #include <cmd_confdefs.h>

View File

@ -726,7 +726,7 @@ static void DhcpOptionsProcess (uchar * popt)
case 1: case 1:
NetCopyIP (&NetOurSubnetMask, (popt + 2)); NetCopyIP (&NetOurSubnetMask, (popt + 2));
break; break;
#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET) #if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET)
case 2: /* Time offset */ case 2: /* Time offset */
NetCopyLong (&NetTimeOffset, (ulong *) (popt + 2)); NetCopyLong (&NetTimeOffset, (ulong *) (popt + 2));
NetTimeOffset = ntohl (NetTimeOffset); NetTimeOffset = ntohl (NetTimeOffset);
@ -755,7 +755,7 @@ static void DhcpOptionsProcess (uchar * popt)
memcpy (&NetOurRootPath, popt + 2, size); memcpy (&NetOurRootPath, popt + 2, size);
NetOurRootPath[size] = 0; NetOurRootPath[size] = 0;
break; break;
#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_NTPSERVER) #if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_NTPSERVER)
case 42: /* NTP server IP */ case 42: /* NTP server IP */
NetCopyIP (&NetNtpServerIP, (popt + 2)); NetCopyIP (&NetNtpServerIP, (popt + 2));
break; break;

View File

@ -52,28 +52,27 @@ SntpTimeout (void)
static void static void
SntpHandler (uchar *pkt, unsigned dest, unsigned src, unsigned len) SntpHandler (uchar *pkt, unsigned dest, unsigned src, unsigned len)
{ {
struct sntp_pkt_t rpkt; struct sntp_pkt_t *rpktp = (struct sntp_pkt_t *)pkt;
struct rtc_time tm; struct rtc_time tm;
ulong seconds;
debug ("%s\n", __FUNCTION__); debug ("%s\n", __FUNCTION__);
if (dest != SntpOurPort) return; if (dest != SntpOurPort) return;
memcpy ((unsigned char *)&rpkt, pkt, len); /*
* As the RTC's used in U-Boot sepport second resolution only
* we simply ignore the sub-second field.
*/
memcpy (&seconds, &rpktp->transmit_timestamp, sizeof(ulong));
#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP) to_tm(ntohl(seconds) - 2208988800UL + NetTimeOffset, &tm);
to_tm(ntohl(rpkt.transmit_timestamp), &tm);
printf ("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
tm.tm_year, tm.tm_mon, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
to_tm(ntohl(rpkt.transmit_timestamp) - 2208988800u + NetTimeOffset, &tm);
#if (CONFIG_COMMANDS & CFG_CMD_DATE) #if (CONFIG_COMMANDS & CFG_CMD_DATE)
rtc_set (&tm); rtc_set (&tm);
#endif #endif
printf ("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n", printf ("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_year, tm.tm_mon, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec); tm.tm_hour, tm.tm_min, tm.tm_sec);
#endif
NetState = NETLOOP_SUCCESS; NetState = NETLOOP_SUCCESS;
} }