diff options
61 files changed, 476 insertions, 372 deletions
@@ -2,6 +2,9 @@ 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: - Fix flash erase timeout on CMC_PU2 - Add automatic HW detection for CMC_PU2 and CMC_BASIC diff --git a/board/Marvell/common/ecctest.c b/board/Marvell/common/ecctest.c index 6247b45..e22b113 100644 --- a/board/Marvell/common/ecctest.c +++ b/board/Marvell/common/ecctest.c @@ -1,5 +1,3 @@ -indent: Standard input:49: Warning:old style assignment ambiguity in "=*". Assuming "= *" - /* * (C) Copyright 2001 * diff --git a/common/cmd_net.c b/common/cmd_net.c index b6d436e..18ea4b9 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -137,13 +137,13 @@ static void netboot_update_env (void) if (NetOurNISDomain[0]) setenv ("domain", NetOurNISDomain); -#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET) +#if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET) if (NetTimeOffset) { sprintf (tmp, "%d", NetTimeOffset); setenv ("timeoffset", tmp); } #endif -#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_NTPSERVER) +#if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_NTPSERVER) if (NetNtpServerIP) { ip_to_string (NetNtpServerIP, tmp); setenv ("ntpserverip", tmp); diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 25a3cc4..fbddb12 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -27,6 +27,7 @@ #include <common.h> #include <command.h> +#include <asm/byteorder.h> #if (CONFIG_COMMANDS & CFG_CMD_USB) diff --git a/include/configs/AMX860.h b/include/configs/AMX860.h index 420cd08..c23fcc7 100644 --- a/include/configs/AMX860.h +++ b/include/configs/AMX860.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -47,8 +47,6 @@ #define MPC8XX_XIN 5000000 /* 5 MHz in */ #define MPC8XX_HZ ((MPC8XX_XIN) * (MPC8XX_FACT)) -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ - #if 0 #define CONFIG_BOOTDELAY -1 /* autoboot disabled */ #else @@ -80,7 +78,9 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ 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) diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h index 5ab6fe6..4927a37 100644 --- a/include/configs/Alaska8220.h +++ b/include/configs/Alaska8220.h @@ -58,44 +58,30 @@ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ - #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ + /* * Supported commands */ -/* CONFIG_CMD_DFL includes CFG_CMD_BDI (bdinfo), CFG_CMD_LOADS (loads), - CFG_CMD_LOADB (loadb), CFG_CMD_IMI (iminfo), CFG_CMD_FLASH - (flinfo, erase, protect), CFG_CMD_MEMORY (md, mm, nm, mw, cp, cmp, - crc, base, loop, mtest), CFG_CMD_ENV (printenv, setenv, saveenv), - CFG_CMD_BOOTD (bootd), CFG_CMD_CONSOLE (coninfo), CFG_CMD_NET (bootp, - tftpboot, rarpboot), CFG_CMD_RUN, CFG_CMD_MISC (sleep, etc), - CFG_CMD_BSP, CFG_CMD_IMLS, CFG_CMD_FPGA */ - -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_BOOTD | \ - CFG_CMD_CACHE | \ - CFG_CMD_DIAG | \ - CFG_CMD_EEPROM | \ - CFG_CMD_ELF | \ - CFG_CMD_I2C | \ - 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_COMMANDS ( CONFIG_CMD_DFL | \ + CFG_CMD_BOOTD | \ + CFG_CMD_CACHE | \ + CFG_CMD_DHCP | \ + CFG_CMD_DIAG | \ + CFG_CMD_EEPROM | \ + CFG_CMD_ELF | \ + CFG_CMD_I2C | \ + CFG_CMD_NET | \ + CFG_CMD_NFS | \ + CFG_CMD_PING | \ + CFG_CMD_PCI | \ + CFG_CMD_REGINFO | \ + CFG_CMD_SDRAM | \ + CFG_CMD_SNTP ) + +#define CONFIG_NET_MULTI /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h index d64dd2a..6f38633 100644 --- a/include/configs/CATcenter.h +++ b/include/configs/CATcenter.h @@ -1,7 +1,7 @@ /* * ueberarbeitet durch Christoph Seyfert * - * (C) Copyright 2004 DENX Software Engineering, + * (C) Copyright 2004-2005 DENX Software Engineering, * Wolfgang Grandegger <wg@denx.de> * (C) Copyright 2003 * DAVE Srl @@ -117,14 +117,19 @@ #endif #define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ + #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ + CFG_CMD_DHCP | \ CFG_CMD_ELF | \ CFG_CMD_EEPROM | \ CFG_CMD_I2C | \ CFG_CMD_IRQ | \ CFG_CMD_JFFS2 | \ CFG_CMD_MII | \ - CFG_CMD_NAND ) + CFG_CMD_NAND | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION diff --git a/include/configs/CCM.h b/include/configs/CCM.h index ba15e91..9401db1 100644 --- a/include/configs/CCM.h +++ b/include/configs/CCM.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * 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_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_NETMASK 255.255.255.0 @@ -98,10 +97,12 @@ #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ + CFG_CMD_BSP | \ CFG_CMD_DHCP | \ CFG_CMD_DATE | \ CFG_CMD_EEPROM | \ - CFG_CMD_BSP ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h index aae7d8c..b882f7a 100644 --- a/include/configs/CPC45.h +++ b/include/configs/CPC45.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001-2003 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -69,7 +69,8 @@ CFG_CMD_NFS | \ CFG_CMD_PCI | \ CFG_CMD_PING | \ - CFG_CMD_SDRAM ) + CFG_CMD_SDRAM | \ + CFG_CMD_SNTP ) /* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */ diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h index 390b796..ce7ccc2 100644 --- a/include/configs/CPU86.h +++ b/include/configs/CPU86.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * 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_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; " \ @@ -166,12 +164,15 @@ #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_BEDBUG | \ - CFG_CMD_EEPROM | \ - CFG_CMD_DATE | \ - CFG_CMD_I2C | \ - CFG_CMD_DOC ) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_BEDBUG | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + 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) */ #include <cmd_confdefs.h> diff --git a/include/configs/CU824.h b/include/configs/CU824.h index ccbed31..acc8484 100644 --- a/include/configs/CU824.h +++ b/include/configs/CU824.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -50,8 +50,6 @@ #define CONFIG_BAUDRATE 9600 #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_BOOTCOMMAND "bootm FE020000" /* autoboot command */ @@ -59,11 +57,15 @@ #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ + #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_BEDBUG | \ + 0 /* CFG_CMD_DATE */ | \ CFG_CMD_DHCP | \ 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) */ diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h index 14546f0..423d74e 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -47,8 +47,6 @@ #endif #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_BOOTARGS "root=/dev/nfs rw " \ @@ -66,8 +64,10 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h index ca926a7..6645b8b 100644 --- a/include/configs/HMI10.h +++ b/include/configs/HMI10.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -133,7 +133,9 @@ CFG_CMD_DHCP | \ CFG_CMD_FAT | \ CFG_CMD_I2C | \ - CFG_CMD_IDE ) + CFG_CMD_IDE | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) #else # define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ @@ -141,7 +143,9 @@ CFG_CMD_DHCP | \ CFG_CMD_FAT | \ CFG_CMD_I2C | \ - CFG_CMD_IDE ) + CFG_CMD_IDE | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) #endif /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h index fea0fce..b0c8ac6 100644 --- a/include/configs/ICU862.h +++ b/include/configs/ICU862.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001-2002 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -62,8 +62,6 @@ #endif #endif -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ - #if 0 #define CONFIG_BOOTDELAY -1 /* autoboot disabled */ #else @@ -126,11 +124,13 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_EEPROM | \ CFG_CMD_I2C | \ CFG_CMD_IDE | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/IP860.h b/include/configs/IP860.h index 47f69a2..aa2243f 100644 --- a/include/configs/IP860.h +++ b/include/configs/IP860.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2004 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -41,8 +41,6 @@ #define CONFIG_BAUDRATE 9600 #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" \ "\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_DELAY_MS 10 /* takes up to 10 msec */ -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_BEDBUG | \ - CFG_CMD_I2C | \ - CFG_CMD_EEPROM) +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ + +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_BEDBUG | \ + CFG_CMD_I2C | \ + CFG_CMD_EEPROM | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) #define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index 3752eb4..6a9a05d 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2003-2004 + * (C) Copyright 2003-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -97,16 +97,20 @@ #define ADD_USB_CMD 0 #endif +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ + /* * Supported commands */ -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_EEPROM | \ - CFG_CMD_FAT | \ - CFG_CMD_I2C | \ - CFG_CMD_IDE | \ - ADD_PCI_CMD | \ - ADD_USB_CMD) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_EEPROM | \ + CFG_CMD_FAT | \ + CFG_CMD_I2C | \ + CFG_CMD_IDE | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP | \ + ADD_PCI_CMD | \ + ADD_USB_CMD ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h index fc225c9..3457770 100644 --- a/include/configs/KUP4K.h +++ b/include/configs/KUP4K.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2004 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Klaus Heydeck, Kieback & Peter GmbH & Co KG, heydeck@kieback-peter.de * @@ -48,8 +48,6 @@ #define CONFIG_BOOTDELAY 1 /* autoboot after 1 second */ #endif -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ - #define CONFIG_BOARD_TYPES 1 /* support board types */ @@ -166,11 +164,13 @@ #endif #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_I2C | \ - CFG_CMD_DATE | \ + CFG_CMD_IDE | \ + CFG_CMD_NFS | \ CFG_CMD_POST_DIAG | \ - CFG_CMD_IDE ) + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h index 849f308..5bad824 100644 --- a/include/configs/KUP4X.h +++ b/include/configs/KUP4X.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2004 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Klaus Heydeck, Kieback & Peter GmbH & Co KG, heydeck@kieback-peter.de * @@ -48,8 +48,6 @@ #define CONFIG_BOOTDELAY 1 /* autoboot after 1 second */ #endif -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ - #define CONFIG_BOARD_TYPES 1 /* support board types */ #define CFG_8XX_FACT 8 /* Multiply by 8 */ @@ -177,13 +175,15 @@ #endif #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ + CFG_CMD_FAT | \ CFG_CMD_I2C | \ - CFG_CMD_DATE | \ - CFG_CMD_POST_DIAG | \ CFG_CMD_IDE | \ - CFG_CMD_USB | \ - CFG_CMD_FAT) + CFG_CMD_NFS | \ + CFG_CMD_POST_DIAG | \ + CFG_CMD_SNTP | \ + CFG_CMD_USB ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index 6b7bdda..6eec253 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -177,32 +177,33 @@ #define CONFIG_BAUDRATE 115200 -#define CFG_EXCLUDE CFG_CMD_BEDBUG | \ - CFG_CMD_BMP | \ - CFG_CMD_BSP | \ - CFG_CMD_DATE | \ - CFG_CMD_DOC | \ - CFG_CMD_DTT | \ - CFG_CMD_EEPROM | \ - CFG_CMD_ELF | \ - CFG_CMD_EXT2 | \ - CFG_CMD_FAT | \ - CFG_CMD_FDC | \ - CFG_CMD_FDOS | \ - CFG_CMD_HWFLOW | \ - CFG_CMD_IDE | \ - CFG_CMD_KGDB | \ - CFG_CMD_MMC | \ - CFG_CMD_NAND | \ - CFG_CMD_PCI | \ - CFG_CMD_PCMCIA | \ - CFG_CMD_REISER | \ - CFG_CMD_SCSI | \ - CFG_CMD_SPI | \ - CFG_CMD_UNIVERSE | \ - CFG_CMD_USB | \ - CFG_CMD_VFD | \ - CFG_CMD_XIMG +#define CFG_EXCLUDE CFG_CMD_BEDBUG | \ + CFG_CMD_BMP | \ + CFG_CMD_BSP | \ + CFG_CMD_DATE | \ + CFG_CMD_DOC | \ + CFG_CMD_DTT | \ + CFG_CMD_EEPROM | \ + CFG_CMD_ELF | \ + CFG_CMD_EXT2 | \ + CFG_CMD_FAT | \ + CFG_CMD_FDC | \ + CFG_CMD_FDOS | \ + CFG_CMD_HWFLOW | \ + CFG_CMD_IDE | \ + CFG_CMD_KGDB | \ + CFG_CMD_MMC | \ + CFG_CMD_NAND | \ + CFG_CMD_PCI | \ + CFG_CMD_PCMCIA | \ + CFG_CMD_REISER | \ + CFG_CMD_SCSI | \ + CFG_CMD_SPI | \ + CFG_CMD_SNTP | \ + CFG_CMD_UNIVERSE | \ + CFG_CMD_USB | \ + CFG_CMD_VFD | \ + CFG_CMD_XIMG #if CONFIG_ADSTYPE >= CFG_PQ2FADS #define CONFIG_COMMANDS (CFG_CMD_ALL & ~( \ diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index 88efd95..89f2d09 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -145,33 +145,34 @@ #define CONFIG_BAUDRATE 115200 -#define CONFIG_COMMANDS (CFG_CMD_ALL & ~( \ - CFG_CMD_BEDBUG | \ - CFG_CMD_BMP | \ - CFG_CMD_BSP | \ - CFG_CMD_DATE | \ - CFG_CMD_DHCP | \ - CFG_CMD_DOC | \ - CFG_CMD_DTT | \ - CFG_CMD_EEPROM | \ - CFG_CMD_ELF | \ - CFG_CMD_EXT2 | \ - CFG_CMD_FDC | \ - CFG_CMD_FDOS | \ - CFG_CMD_HWFLOW | \ - CFG_CMD_IDE | \ - CFG_CMD_JFFS2 | \ - CFG_CMD_KGDB | \ - CFG_CMD_MMC | \ - CFG_CMD_NAND | \ - CFG_CMD_PCMCIA | \ - CFG_CMD_REISER | \ - CFG_CMD_SCSI | \ - CFG_CMD_SPI | \ - CFG_CMD_VFD | \ - CFG_CMD_UNIVERSE | \ - CFG_CMD_USB | \ - CFG_CMD_XIMG ) ) +#define CONFIG_COMMANDS ( CFG_CMD_ALL & ~( \ + CFG_CMD_BEDBUG | \ + CFG_CMD_BMP | \ + CFG_CMD_BSP | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_DOC | \ + CFG_CMD_DTT | \ + CFG_CMD_EEPROM | \ + CFG_CMD_ELF | \ + CFG_CMD_EXT2 | \ + CFG_CMD_FDC | \ + CFG_CMD_FDOS | \ + CFG_CMD_HWFLOW | \ + CFG_CMD_IDE | \ + CFG_CMD_JFFS2 | \ + CFG_CMD_KGDB | \ + CFG_CMD_MMC | \ + CFG_CMD_NAND | \ + CFG_CMD_PCMCIA | \ + CFG_CMD_REISER | \ + CFG_CMD_SCSI | \ + CFG_CMD_SPI | \ + CFG_CMD_SNTP | \ + CFG_CMD_VFD | \ + CFG_CMD_UNIVERSE | \ + CFG_CMD_USB | \ + CFG_CMD_XIMG ) ) /* Define a command string that is automatically executed when no character * is read on the console interface withing "Boot Delay" after reset. diff --git a/include/configs/NC650.h b/include/configs/NC650.h index a7957e3..3c976bb 100644 --- a/include/configs/NC650.h +++ b/include/configs/NC650.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2004 + * (C) Copyright 2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -118,10 +118,12 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_I2C | \ CFG_CMD_NAND | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h index 6765131..db86cf3 100644 --- a/include/configs/NSCU.h +++ b/include/configs/NSCU.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -95,9 +95,11 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_IDE | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/OCOTEA.h b/include/configs/OCOTEA.h index f69ab1b..dc2b419 100644 --- a/include/configs/OCOTEA.h +++ b/include/configs/OCOTEA.h @@ -164,18 +164,20 @@ #define CONFIG_SERVERIP 10.1.2.2 #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_PING | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ CFG_CMD_DIAG | \ + CFG_CMD_ELF | \ + CFG_CMD_I2C | \ + CFG_CMD_IRQ | \ + CFG_CMD_KGDB | \ CFG_CMD_MII | \ 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) */ #include <cmd_confdefs.h> diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h index f90c52e..d03706e 100644 --- a/include/configs/PCIPPC2.h +++ b/include/configs/PCIPPC2.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2002 + * (C) Copyright 2002-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -50,8 +50,6 @@ #define CONFIG_BAUDRATE 9600 #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_BOOTDELAY 5 @@ -61,14 +59,16 @@ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_ASKENV | \ - CFG_CMD_BSP | \ - CFG_CMD_DATE | \ - CFG_CMD_DHCP | \ - CFG_CMD_DOC | \ - CFG_CMD_ELF | \ - CFG_CMD_PCI ) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_ASKENV | \ + CFG_CMD_BSP | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_DOC | \ + CFG_CMD_ELF | \ + CFG_CMD_NFS | \ + CFG_CMD_PCI | \ + CFG_CMD_SNTP ) #define CONFIG_PCI 1 #define CONFIG_PCI_PNP 1 /* PCI plug-and-play */ diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h index f4a5dd8..92b2f7c 100644 --- a/include/configs/PCIPPC6.h +++ b/include/configs/PCIPPC6.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2002 + * (C) Copyright 2002-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -50,8 +50,6 @@ #define CONFIG_BAUDRATE 9600 #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_BOOTDELAY 5 @@ -61,15 +59,17 @@ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_ASKENV | \ - CFG_CMD_BSP | \ - CFG_CMD_DATE | \ - CFG_CMD_DHCP | \ - CFG_CMD_DOC | \ - CFG_CMD_ELF | \ - CFG_CMD_PCI | \ - CFG_CMD_SCSI ) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_ASKENV | \ + CFG_CMD_BSP | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_DOC | \ + CFG_CMD_ELF | \ + CFG_CMD_NFS | \ + CFG_CMD_PCI | \ + CFG_CMD_SCSI | \ + CFG_CMD_SNTP ) #define CONFIG_PCI 1 diff --git a/include/configs/PM520.h b/include/configs/PM520.h index a91662c..49ae55c 100644 --- a/include/configs/PM520.h +++ b/include/configs/PM520.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2003-2004 + * (C) Copyright 2003-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -105,16 +105,19 @@ /* * Supported commands */ -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_EEPROM | \ - CFG_CMD_FAT | \ - CFG_CMD_I2C | \ - CFG_CMD_IDE | \ - ADD_DOC_CMD | \ - ADD_PCI_CMD | \ - CFG_CMD_DATE | \ - CFG_CMD_BEDBUG | \ - ADD_USB_CMD) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + ADD_DOC_CMD | \ + ADD_PCI_CMD | \ + ADD_USB_CMD | \ + CFG_CMD_BEDBUG | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_EEPROM | \ + CFG_CMD_FAT | \ + CFG_CMD_I2C | \ + CFG_CMD_IDE | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/PM826.h b/include/configs/PM826.h index 942678f..a4c4fc9 100644 --- a/include/configs/PM826.h +++ b/include/configs/PM826.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001-2004 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * 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 */ -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ - #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #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) #ifdef CONFIG_PCI -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_BEDBUG | \ - CFG_CMD_DATE | \ - CFG_CMD_DOC | \ - CFG_CMD_EEPROM | \ - CFG_CMD_I2C | \ - CFG_CMD_PCI) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_BEDBUG | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_DOC | \ + CFG_CMD_EEPROM | \ + CFG_CMD_I2C | \ + CFG_CMD_NFS | \ + CFG_CMD_PCI | \ + CFG_CMD_SNTP ) #else /* ! PCI */ -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_BEDBUG | \ - CFG_CMD_DATE | \ - CFG_CMD_DOC | \ - CFG_CMD_EEPROM | \ - CFG_CMD_I2C ) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_BEDBUG | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_DOC | \ + CFG_CMD_EEPROM | \ + CFG_CMD_I2C | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) #endif /* CONFIG_PCI */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ diff --git a/include/configs/PM828.h b/include/configs/PM828.h index d6a926d..5b71c96 100644 --- a/include/configs/PM828.h +++ b/include/configs/PM828.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001-2004 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * 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 */ -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ - #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #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) #ifdef CONFIG_PCI -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_BEDBUG | \ - CFG_CMD_DATE | \ - CFG_CMD_DOC | \ - CFG_CMD_EEPROM | \ - CFG_CMD_I2C | \ - CFG_CMD_PCI) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_BEDBUG | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_DOC | \ + CFG_CMD_EEPROM | \ + CFG_CMD_I2C | \ + CFG_CMD_NFS | \ + CFG_CMD_PCI | \ + CFG_CMD_SNTP ) #else /* ! PCI */ -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_BEDBUG | \ - CFG_CMD_DATE | \ - CFG_CMD_DOC | \ - CFG_CMD_EEPROM | \ - CFG_CMD_I2C ) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_BEDBUG | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_DOC | \ + CFG_CMD_EEPROM | \ + CFG_CMD_I2C | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) #endif /* CONFIG_PCI */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index e4ad1fb..98af125 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -1,4 +1,7 @@ /* + * (C) Copyright 2003-2005 + * Wolfgang Denk, DENX Software Engineering, <wd@denx.de> + * * (C) Copyright 2003 * DAVE Srl * @@ -112,6 +115,7 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ CFG_CMD_ELF | \ CFG_CMD_EEPROM | \ CFG_CMD_I2C | \ @@ -119,7 +123,9 @@ CFG_CMD_JFFS2 | \ CFG_CMD_MII | \ CFG_CMD_NAND | \ - CFG_CMD_PCI ) + CFG_CMD_NFS | \ + CFG_CMD_PCI | \ + CFG_CMD_SNTP ) #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h index 72fdf4d..c456fbf 100644 --- a/include/configs/R360MPI.h +++ b/include/configs/R360MPI.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2002 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -113,13 +113,15 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_BMP | \ - CFG_CMD_DHCP | \ + CFG_CMD_BSP | \ CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ CFG_CMD_I2C | \ CFG_CMD_IDE | \ CFG_CMD_JFFS2 | \ + CFG_CMD_NFS | \ CFG_CMD_PCMCIA | \ - CFG_CMD_BSP ) + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h index 4623dbb..b0e4910 100644 --- a/include/configs/RBC823.h +++ b/include/configs/RBC823.h @@ -113,6 +113,7 @@ ~CFG_CMD_REISER & \ ~CFG_CMD_SCSI & \ ~CFG_CMD_SETGETDCR & \ + ~CFG_CMD_SNTP & \ ~CFG_CMD_SPI & \ ~CFG_CMD_UNIVERSE & \ ~CFG_CMD_USB & \ diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h index 1c37f63..7c4feee 100644 --- a/include/configs/Sandpoint8240.h +++ b/include/configs/Sandpoint8240.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -80,12 +80,15 @@ "" #define CONFIG_BOOTCOMMAND "run flash_self" -#define CONFIG_COMMANDS ( (CONFIG_CMD_DFL & ~CFG_CMD_AUTOSCRIPT) | \ - CFG_CMD_ELF | \ - CFG_CMD_I2C | \ - CFG_CMD_SDRAM | \ - CFG_CMD_EEPROM | \ - CFG_CMD_PCI ) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_DHCP | \ + CFG_CMD_ELF | \ + CFG_CMD_I2C | \ + CFG_CMD_SDRAM | \ + CFG_CMD_EEPROM | \ + CFG_CMD_NFS | \ + CFG_CMD_PCI | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h index 46c6fdd..d42bd69 100644 --- a/include/configs/Sandpoint8245.h +++ b/include/configs/Sandpoint8245.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001, 2002 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -49,11 +49,16 @@ #define CONFIG_BAUDRATE 9600 #define CONFIG_DRAM_SPEED 100 /* MHz */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_ELF | \ - CFG_CMD_I2C | \ - CFG_CMD_EEPROM | \ - CFG_CMD_PCI ) +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ + +#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ + CFG_CMD_DHCP | \ + 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) */ #include <cmd_confdefs.h> diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index b33f726..b60e3cd 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -165,9 +165,11 @@ CFG_CMD_EEPROM | \ CFG_CMD_I2C | \ CFG_CMD_MII | \ + CFG_CMD_NFS | \ CFG_CMD_PING | \ 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) */ #include <cmd_confdefs.h> diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index b1aced0..d12aabe 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -101,13 +101,17 @@ CFG_CMD_BMP | \ CFG_CMD_DATE | \ CFG_CMD_DHCP | \ - CFG_CMD_IDE ) + CFG_CMD_IDE | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) #else # define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ CFG_CMD_DATE | \ CFG_CMD_DHCP | \ - CFG_CMD_IDE ) + CFG_CMD_IDE | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) #endif /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 0c2dbec..a838a95 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -97,9 +97,11 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_IDE | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h index 2dd6912..eaf138a 100644 --- a/include/configs/TQM8260.h +++ b/include/configs/TQM8260.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001-2003 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -216,11 +216,16 @@ #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_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_I2C | \ - CFG_CMD_EEPROM) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_DHCP | \ + CFG_CMD_I2C | \ + CFG_CMD_EEPROM | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index d6784c8..83eb40f 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -89,9 +89,11 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_IDE | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index e825ac9..f20d246 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -87,9 +87,11 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_IDE | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/TQM8540.h b/include/configs/TQM8540.h index 7d3d60f..fb965f5 100644 --- a/include/configs/TQM8540.h +++ b/include/configs/TQM8540.h @@ -1,5 +1,6 @@ /* * Copyright 2005 DENX Software Engineering + * Wolfgang Denk <wd@denx.de> * Copyright 2004 Freescale Semiconductor. * (C) Copyright 2002,2003 Motorola,Inc. * Xianghua Xiao <X.Xiao@motorola.com> @@ -144,9 +145,6 @@ #define CFG_FLASH_CFI #define CFG_FLASH_EMPTY_INFO -#undef CONFIG_CLOCKS_IN_MHZ - - #define CFG_LBC_LCRR 0x00030008 /* LB clock ratio reg */ #define CFG_LBC_LBCR 0x00000000 /* LB config reg */ #define CFG_LBC_LSRT 0x20000000 /* LB sdram refresh timer */ @@ -322,36 +320,27 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ + #if defined(CFG_RAMBOOT) - #if defined(CONFIG_PCI) - #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 +# define CONFIG_CMD_PRIV (CONFIG_CMD_DFL & ~(CFG_CMD_ENV | CFG_CMD_LOADS)) +#else +# define CONFIG_CMD_PRIV (CONFIG_CMD_DFL | \ + CFG_CMD_DHCP | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) +#endif + +#if defined(CONFIG_PCI) +# define ADD_PCI_CMD (CFG_CMD_PCI) #else - #if defined(CONFIG_PCI) - #define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PCI \ - | CFG_CMD_PING \ - | CFG_CMD_I2C) - #else - #define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_I2C) - #endif +# 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> #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 9c06d48..24071ff 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -92,9 +92,11 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_IDE | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 82a855b..95a41e8 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2004 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -125,10 +125,12 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_EEPROM | \ CFG_CMD_IDE | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index fece9d1..655427e 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -96,6 +96,7 @@ CFG_CMD_DHCP | \ CFG_CMD_ELF | \ CFG_CMD_IDE | \ + CFG_CMD_NFS | \ CFG_CMD_SNTP ) #define CONFIG_NETCONSOLE diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 1e9abc8..f67cbd2 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -92,10 +92,12 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_ELF | \ CFG_CMD_IDE | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 595d4a2..2586518 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -95,9 +95,11 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_IDE | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 7ab8559..8c15499 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -95,9 +95,11 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_IDE | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 2328118..4b85013 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2004 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -136,10 +136,13 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_EEPROM | \ + CFG_CMD_I2C | \ CFG_CMD_IDE | \ - CFG_CMD_I2C ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h index a4859b5..c1499f4 100644 --- a/include/configs/c2mon.h +++ b/include/configs/c2mon.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * 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_COMMANDS ( CONFIG_CMD_DFL | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_IDE | \ - CFG_CMD_DATE ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h index b483151..34efc38 100644 --- a/include/configs/cmc_pu2.h +++ b/include/configs/cmc_pu2.h @@ -1,5 +1,5 @@ /* - * Gary Jennejohn <garyj@denx.de> + * 2004-2005 Gary Jennejohn <garyj@denx.de> * * Configuration settings for the CMC PU2 board. * @@ -126,15 +126,19 @@ #ifdef CONFIG_HARD_I2C #define CONFIG_COMMANDS \ ((CONFIG_CMD_DFL | \ - CFG_CMD_I2C | \ CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ CFG_CMD_EEPROM | \ - CFG_CMD_DHCP ) & \ + CFG_CMD_I2C | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) & \ ~(CFG_CMD_FPGA | CFG_CMD_MISC) ) #else #define CONFIG_COMMANDS \ ((CONFIG_CMD_DFL | \ - CFG_CMD_DHCP ) & \ + CFG_CMD_DHCP | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) & \ ~(CFG_CMD_FPGA | CFG_CMD_MISC) ) #define CONFIG_TIMESTAMP #endif diff --git a/include/configs/incaip.h b/include/configs/incaip.h index 2180607..7db3744 100644 --- a/include/configs/incaip.h +++ b/include/configs/incaip.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2003 + * (C) Copyright 2003-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -81,12 +81,14 @@ "" #define CONFIG_BOOTCOMMAND "run flash_self" -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_ASKENV | \ - CFG_CMD_DHCP | \ - CFG_CMD_ELF | \ - CFG_CMD_JFFS2 | \ - CFG_CMD_PING ) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_ASKENV | \ + CFG_CMD_DHCP | \ + CFG_CMD_ELF | \ + CFG_CMD_JFFS2 | \ + CFG_CMD_NFS | \ + CFG_CMD_PING | \ + CFG_CMD_SNTP ) #include <cmd_confdefs.h> /* diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 9e98e63..82a3842 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2003-2004 + * (C) Copyright 2003-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -80,10 +80,13 @@ * Supported commands */ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CFG_CMD_DHCP | \ CFG_CMD_EXT2 | \ CFG_CMD_FAT | \ CFG_CMD_IDE | \ + CFG_CMD_NFS | \ CFG_CMD_PCI | \ + CFG_CMD_SNTP | \ CFG_CMD_USB ) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index 3ed4727..72d325d 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -176,15 +176,17 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ - CFG_CMD_DHCP | \ + CFG_CMD_BMP | \ + CFG_CMD_BSP | \ CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_EEPROM | \ CFG_CMD_FAT | \ CFG_CMD_I2C | \ - CFG_CMD_EEPROM | \ CFG_CMD_IDE | \ - CFG_CMD_BSP | \ - CFG_CMD_BMP | \ - CFG_CMD_POST_DIAG ) + CFG_CMD_NFS | \ + CFG_CMD_POST_DIAG | \ + CFG_CMD_SNTP ) #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION diff --git a/include/configs/pcu_e.h b/include/configs/pcu_e.h index 833d2d1..e261e53 100644 --- a/include/configs/pcu_e.h +++ b/include/configs/pcu_e.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2001 + * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -90,9 +90,12 @@ #define CFG_SPI_INIT_OFFSET 0xB00 #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ + CFG_CMD_BSP | \ CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ CFG_CMD_EEPROM | \ - CFG_CMD_BSP ) + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) #define CONFIG_BOOTP_MASK \ ((CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) & ~CONFIG_BOOTP_GATEWAY) diff --git a/include/configs/quantum.h b/include/configs/quantum.h index 9140efb..a38ec62 100644 --- a/include/configs/quantum.h +++ b/include/configs/quantum.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2003 + * (C) Copyright 2003-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -51,8 +51,6 @@ /* 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_IPADDR 10.10.69.10 @@ -97,8 +95,10 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_DATE | \ CFG_CMD_DHCP | \ - CFG_CMD_PING | \ - CFG_CMD_REGINFO) + CFG_CMD_NFS | \ + CFG_CMD_PING | \ + CFG_CMD_REGINFO | \ + CFG_CMD_SNTP ) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) diff --git a/include/configs/rmu.h b/include/configs/rmu.h index c894d8a..b67c418 100644 --- a/include/configs/rmu.h +++ b/include/configs/rmu.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2003 + * (C) Copyright 2003-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -90,7 +90,9 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_DATE | \ 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) diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h index a7621a2..b95b8c0 100644 --- a/include/configs/smdk2400.h +++ b/include/configs/smdk2400.h @@ -1,4 +1,6 @@ /* + * (C) Copyright 2002-2005 + * Wolfgang Denk, DENX Software Engineering, <wd@denx.de> * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Marius Groeger <mgroeger@sysgo.de> @@ -91,10 +93,13 @@ #define CONFIG_RTC_S3C24X0 1 #ifndef USE_920T_MMU -#define CONFIG_COMMANDS_tmp ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \ - CFG_CMD_DATE) +#define CONFIG_COMMANDS_tmp ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \ + CFG_CMD_DATE | \ + CFG_CMD_SNTP ) #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 #ifdef CONFIG_HWFLOW diff --git a/include/configs/trab.h b/include/configs/trab.h index 59cd1d4..137d934 100644 --- a/include/configs/trab.h +++ b/include/configs/trab.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2002-2003 + * (C) Copyright 2002-2005 * Gary Jennejohn <gj@denx.de> * * Configuation settings for the TRAB board. @@ -157,25 +157,31 @@ #endif #ifndef USE_920T_MMU -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \ - CFG_CMD_BSP | \ - CFG_CMD_DATE | \ - CONFIG_COMMANDS_ADD_HWFLOW | \ - CONFIG_COMMANDS_ADD_VFD | \ - CONFIG_COMMANDS_ADD_EEPROM | \ - CFG_CMD_USB | \ - CFG_CMD_FAT | \ - CONFIG_COMMANDS_I2C ) +#define CONFIG_COMMANDS ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \ + CONFIG_COMMANDS_ADD_HWFLOW | \ + CONFIG_COMMANDS_ADD_VFD | \ + CONFIG_COMMANDS_ADD_EEPROM | \ + CONFIG_COMMANDS_I2C | \ + CFG_CMD_BSP | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_USB | \ + CFG_CMD_FAT | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) #else -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_BSP | \ - CFG_CMD_DATE | \ - CONFIG_COMMANDS_ADD_HWFLOW | \ - CONFIG_COMMANDS_ADD_VFD | \ - CONFIG_COMMANDS_ADD_EEPROM | \ - CFG_CMD_USB | \ - CFG_CMD_FAT | \ - CONFIG_COMMANDS_I2C ) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ + CONFIG_COMMANDS_ADD_HWFLOW | \ + CONFIG_COMMANDS_ADD_VFD | \ + CONFIG_COMMANDS_ADD_EEPROM | \ + CONFIG_COMMANDS_I2C | \ + CFG_CMD_BSP | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_USB | \ + CFG_CMD_FAT | \ + CFG_CMD_NFS | \ + CFG_CMD_SNTP ) #endif /* moved up */ diff --git a/include/configs/uc100.h b/include/configs/uc100.h index f771d30..187df71 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2004 + * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -125,16 +125,18 @@ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ + CFG_CMD_DATE | \ CFG_CMD_DHCP | \ + CFG_CMD_EEPROM | \ CFG_CMD_ELF | \ - CFG_CMD_IDE | \ CFG_CMD_FAT | \ + CFG_CMD_I2C | \ + CFG_CMD_IDE | \ CFG_CMD_MII | \ + CFG_CMD_NFS | \ CFG_CMD_PING | \ - CFG_CMD_I2C | \ - CFG_CMD_EEPROM | \ - CFG_CMD_DATE | \ - CFG_CMD_POST_DIAG ) + CFG_CMD_POST_DIAG | \ + CFG_CMD_SNTP ) #define CONFIG_NETCONSOLE diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h index 9b8a596..fc3739f 100644 --- a/include/configs/xaeniax.h +++ b/include/configs/xaeniax.h @@ -1,4 +1,7 @@ /* + * (C) Copyright 2004-2005 + * Wolfgang Denk, DENX Software Engineering, <wd@denx.de> + * * (C) Copyright 2004 * Vincent Dubey, Xa SA, vincent.dubey@xa-ch.com * @@ -65,11 +68,18 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ + #define CONFIG_BAUDRATE 115200 #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) */ #include <cmd_confdefs.h> diff --git a/net/bootp.c b/net/bootp.c index ee0982e..b907351 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -726,7 +726,7 @@ static void DhcpOptionsProcess (uchar * popt) case 1: NetCopyIP (&NetOurSubnetMask, (popt + 2)); break; -#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET) +#if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET) case 2: /* Time offset */ NetCopyLong (&NetTimeOffset, (ulong *) (popt + 2)); NetTimeOffset = ntohl (NetTimeOffset); @@ -755,7 +755,7 @@ static void DhcpOptionsProcess (uchar * popt) memcpy (&NetOurRootPath, popt + 2, size); NetOurRootPath[size] = 0; 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 */ NetCopyIP (&NetNtpServerIP, (popt + 2)); break; @@ -52,28 +52,27 @@ SntpTimeout (void) static void 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; + ulong seconds; debug ("%s\n", __FUNCTION__); 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(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); + to_tm(ntohl(seconds) - 2208988800UL + NetTimeOffset, &tm); #if (CONFIG_COMMANDS & CFG_CMD_DATE) rtc_set (&tm); #endif 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); -#endif NetState = NETLOOP_SUCCESS; } |