]> git.sur5r.net Git - u-boot/commitdiff
Fix problems with SNTP support;
authorwdenk <wdenk>
Sat, 2 Apr 2005 22:37:54 +0000 (22:37 +0000)
committerwdenk <wdenk>
Sat, 2 Apr 2005 22:37:54 +0000 (22:37 +0000)
enable SNTP support in some boards.

61 files changed:
CHANGELOG
board/Marvell/common/ecctest.c
common/cmd_net.c
common/cmd_usb.c
include/configs/AMX860.h
include/configs/Alaska8220.h
include/configs/CATcenter.h
include/configs/CCM.h
include/configs/CPC45.h
include/configs/CPU86.h
include/configs/CU824.h
include/configs/FPS860L.h
include/configs/HMI10.h
include/configs/ICU862.h
include/configs/IP860.h
include/configs/IceCube.h
include/configs/KUP4K.h
include/configs/KUP4X.h
include/configs/MPC8260ADS.h
include/configs/MPC8266ADS.h
include/configs/NC650.h
include/configs/NSCU.h
include/configs/OCOTEA.h
include/configs/PCIPPC2.h
include/configs/PCIPPC6.h
include/configs/PM520.h
include/configs/PM826.h
include/configs/PM828.h
include/configs/PPChameleonEVB.h
include/configs/R360MPI.h
include/configs/RBC823.h
include/configs/Sandpoint8240.h
include/configs/Sandpoint8245.h
include/configs/TQM5200.h
include/configs/TQM823L.h
include/configs/TQM823M.h
include/configs/TQM8260.h
include/configs/TQM850L.h
include/configs/TQM850M.h
include/configs/TQM8540.h
include/configs/TQM855L.h
include/configs/TQM855M.h
include/configs/TQM860L.h
include/configs/TQM860M.h
include/configs/TQM862L.h
include/configs/TQM862M.h
include/configs/TQM866M.h
include/configs/c2mon.h
include/configs/cmc_pu2.h
include/configs/incaip.h
include/configs/inka4x0.h
include/configs/lwmon.h
include/configs/pcu_e.h
include/configs/quantum.h
include/configs/rmu.h
include/configs/smdk2400.h
include/configs/trab.h
include/configs/uc100.h
include/configs/xaeniax.h
net/bootp.c
net/sntp.c

index 01af8dc2920d5f14a34dbd83aee9ef6307c0b3f3..5ccee97257bba3582613436e06cd8585275835bd 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
index 6247b45c291411d60dccad010d1ab3579da6435d..e22b1136a261ff7adca6c7b5cabd356c4a08b9bb 100644 (file)
@@ -1,5 +1,3 @@
-indent: Standard input:49: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
-
 /*
  * (C) Copyright 2001
  *
index b6d436e9c99b11793e76890aacd6ce07a46a0987..18ea4b96fb4733d53bdb90881039abfd2ed38bac 100644 (file)
@@ -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);
index 25a3cc4111097d56ac0b8be07638abdd787abb21..fbddb12dfd78ffa6ddd716b0eaeb4e19f6b22dc7 100644 (file)
@@ -27,6 +27,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/byteorder.h>
 
 #if (CONFIG_COMMANDS & CFG_CMD_USB)
 
index 420cd085f1371c21f6c3bc7bd7f98899f385ffcc..c23fcc7a006520abdba46683a6b4587a9a87686b 100644 (file)
@@ -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)
 
index 5ab6fe63f8fdef7ef14ba96d8a49a20fb051e9f2..4927a379bf818be7654addd6fefa342c173ba444 100644 (file)
 
 #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>
index d64dd2a17ed1d5b7004c328c0ff09d6fec35ea0d..6f38633d63cc0be9d5c9e863ae95a74815de0ac3 100644 (file)
@@ -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
 #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
index ba15e91bffbb6e73c6a20a78f081ba9138156cc7..9401db17df8596288c03ea1583d0554b53acf0a4 100644 (file)
@@ -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
 #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>
index aae7d8c4b08709adf0d0c1b2cec6f94f39d1a496..b882f7a9bfee03b00edca5bb7f0340d7e8787e70 100644 (file)
@@ -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)
  */
index 390b796ada10427de51997c3b8830e4688a89424..ce7ccc2789da3fe6ea0e76dbb3d29bd4aef3fe8a 100644 (file)
@@ -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
 
 #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; "       \
 
 #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>
index ccbed311f6b192eca10dc8d77c256b9d0164832f..acc8484717885e574557d8cffc78492e4551ead9 100644 (file)
@@ -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     */
 
 #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)
  */
index 14546f0a2db73f83201557a0fdbf92b18a077e68..423d74ea07a0222901a9754a734c7567fced4583 100644 (file)
@@ -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 "                     \
 
 #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>
index ca926a732440a33e58cf0ff246cf949572b3553b..6645b8bab08ab18e25f8305a27f7d6d4fd20b4cd 100644 (file)
@@ -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
                                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  | \
                                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) */
index fea0fce256f83ee2341a7cadde2415c174ac9104..b0c8ac6b4ea9d84d34e4f0dc5f4ce3bbd07e1730 100644 (file)
@@ -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
 
 #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>
index 47f69a248d5aeaef5b82581e000619f2d41fdc37..aa2243f3a249b1c17118b55720314a509a5e98a5 100644 (file)
@@ -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"
 
 #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
 
index 3752eb42e71c5444c9cd5a589c8cd10d97bca4d1..6a9a05d31ad9181d46396e0d540eae282e4d88c5 100644 (file)
@@ -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
 #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>
index fc225c918e7934fa9995b189fee6ea9a334ac125..34577707bc5433e8158f48b5e6ef3cf2a57fb201 100644 (file)
@@ -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          */
 
 
 #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>
index 849f3082673da3640a922aaf566d117567d9e88e..5bad82496441ca9d505f2a9b3e70efb6f3acdf3e 100644 (file)
@@ -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                        */
 #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>
index 6b7bdda77d6b21e18b31140e2daac3d7a5d18aca..6eec253b5180fc2db70524a87b2b3276e8e8b9c7 100644 (file)
 
 #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 & ~( \
index 88efd956d7d89805b04d6ac4a5606afb17c7bb7c..89f2d096fd3ce3c87e8851247fedb623985c402d 100644 (file)
 #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.
index a7957e3859c06cd18e4fab1260d4f45200a4735d..3c976bb415ef1dee4e23da03a9fab01ddf0910bf 100644 (file)
@@ -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
 
 #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>
index 6765131ea2da23f6c4e8aa41ce1ae89e311fe4b5..db86cf382f258f1a070046669459cb5c9e043f94 100644 (file)
@@ -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
 
 #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>
index f69ab1b631469348803f74696efab62407e5f424..dc2b419cad06b0fffed35dde4e26f360891bf009 100644 (file)
 #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>
index f90c52e269222366f1d163d82a99a40e65514e59..d03706e19365c667b59e4dea8f10e024ff589a60 100644 (file)
@@ -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
 
 #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 */
index f4a5dd875ef374f07480a6df6fc29a73d7796cbe..92b2f7cf839753744ad936ea9b7ce1b951be41b7 100644 (file)
@@ -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
 
 #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
index a91662cf956b65879d1d002521c643efec8696b2..49ae55c6b424fdb9aa7984acd6e499957d7f98bf 100644 (file)
@@ -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
 /*
  * 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>
index 942678f699dc85e2e686856b57ec9c014aa1437a..a4c4fc973dcbbebc516f224d534b91bf88aac440 100644 (file)
@@ -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"
 #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) */
index d6a926d32f3b4257532eec9ef1b3557e9808e58e..5b71c960fa2b69dab6c80ef8961daf17fd1e1d44 100644 (file)
@@ -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"
 #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) */
index e4ad1fbd876b5aa0f37e7e673d0db2d6464cf6ca..98af125cbf0f6d6dd410a6618d8e358174c326ec 100644 (file)
@@ -1,4 +1,7 @@
 /*
+ * (C) Copyright 2003-2005
+ * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
+ *
  * (C) Copyright 2003
  * DAVE Srl
  *
 
 #define CONFIG_COMMANDS              ( CONFIG_CMD_DFL  | \
                                CFG_CMD_DATE    | \
+                               CFG_CMD_DHCP    | \
                                CFG_CMD_ELF     | \
                                CFG_CMD_EEPROM  | \
                                CFG_CMD_I2C     | \
                                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
index 72fdf4db8b2ca16219b5ca51d652ee0aa66ea109..c456fbf18b1f6b1f4bf5591fb4e4826cdadb632b 100644 (file)
@@ -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
 
 #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>
index 4623dbb8877c51900ac0465dc1e4a9cd539acf40..b0e491067a631e85ab195a7fb15787b85f0e4125 100644 (file)
                                ~CFG_CMD_REISER & \
                                ~CFG_CMD_SCSI   & \
                                ~CFG_CMD_SETGETDCR & \
+                               ~CFG_CMD_SNTP   & \
                                ~CFG_CMD_SPI    & \
                                ~CFG_CMD_UNIVERSE & \
                                ~CFG_CMD_USB    & \
index 1c37f639625c7d05de5e4a96acb5a50ddfe0065d..7c4feee3f51fe6b7dee47fe8fcddde09b273e99b 100644 (file)
@@ -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
        ""
 #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>
index 46c6fdd69796bf181229fc393b1205c4a2c2c464..d42bd69231e6470229be0b9fd3dd16c8078ff7c2 100644 (file)
@@ -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
 #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>
index b33f726e8a05e4a67473a947ad03dc0be0c5c05a..b60e3cd539c85942cb8517e428aedfde863bd4bc 100644 (file)
                                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>
index b1aced07324c8b2f39170a8f883cf9a99ab5a981..d12aabecf9390454411b69f7cb8e2f85ddee01a4 100644 (file)
@@ -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
                                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) */
index 0c2dbec644a0374cd42419f4da8adbbfb2b24a27..a838a95b5ff81fcb01d9e3b13e77f7d37e05f2c3 100644 (file)
@@ -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
 
 #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>
index 2dd69123be382b2aa93ec4e022733441ddadc3ce..eaf138acbf0391c49130fa45760194f9884c3b00 100644 (file)
@@ -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
 
 #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>
index d6784c8e0eab6da6f4af3e317fbcbee641263063..83eb40f7483b8c83d28e5c8490d363b761022d3d 100644 (file)
@@ -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
 
 #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>
index e825ac939eaa125733771740c108d5aed2d4d57a..f20d246d37e530d5fba0ec249b8bfe6937bf787d 100644 (file)
@@ -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
 
 #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>
index 7d3d60f81874081cb94cd09987523fc0cbd8f877..fb965f51c528d5b51d8d56ba5d8ab5c20ac3bc53 100644 (file)
@@ -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>
 #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 */
 #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 */
index 9c06d482c33c67928fb5a19a7bdb7ffd9d4b927d..24071ff1dc30dfc60d7435f807edeb1eab0be93e 100644 (file)
@@ -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
 
 #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>
index 82a855bd04e9f52054c4a0e7ce0c4b65e9bde004..95a41e8afdf1ddfe937d3c5996b8cfaecca4be24 100644 (file)
@@ -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
 
 #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>
index fece9d14f519fab061e9ef9e8197105377bdae45..655427ec77d0c8ff668a0539a1e0697d388712c1 100644 (file)
@@ -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
index 1e9abc81c6a465e6327684ec9274a7a2f707ccd2..f67cbd2de344a1d697dd78136db2078bf7b6e167 100644 (file)
@@ -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
 
 #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>
index 595d4a26b5a4046e0ee6be9eb229c24fea3646c5..2586518bb9e64e06b4d634fcfae9d082ecb88236 100644 (file)
@@ -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
 
 #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>
index 7ab8559ebf8670cf462c1fef4d0aa495d05385ca..8c154995f4961c10ced742cbb1febe8f922bbb5d 100644 (file)
@@ -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
 
 #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>
index 2328118330362f526ffad80349c91d2596d47bb1..4b850131c176ad3f993213f107f3de35dec44f96 100644 (file)
@@ -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
 
 #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>
index a4859b54646752fc463f82418ccefa51037e428e..c1499f425eebefa14ea864d21cfc0f821ff257d9 100644 (file)
@@ -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
 #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>
index b483151d047e936d246fb36d3af0c6fa93685f91..34efc384b917d98a2d5b2507dbb7d6120f812d81 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Gary Jennejohn <garyj@denx.de>
+ * 2004-2005 Gary Jennejohn <garyj@denx.de>
  *
  * Configuration settings for the CMC PU2 board.
  *
 #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
index 218060708d37e40ee5556c9539da9522e9e70abb..7db3744cf4554947ef37646048dddef0e1803108 100644 (file)
@@ -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
        ""
 #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>
 
 /*
index 9e98e6307d9f1a99d8a1aef8cceee8a4c93229bd..82a384202cf37c5876a878dea83febdfeb7df90c 100644 (file)
@@ -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
  * 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) */
index 3ed4727e20a52583afd75788dbb5fa17e532da10..72d325ddee9b80cb72a2f84d1ef46c9d419c22c8 100644 (file)
@@ -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
 
 #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
 
index 833d2d14fe38fb45651c7388ae062037bbd8b0ca..e261e5367a5f7d63b2a0afb994b034729c079a53 100644 (file)
@@ -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
 #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)
index 9140efb87a8a0fdaafb52fe66a86bbee153e432b..a38ec6232205e17547fb318a3d130d442b584908 100644 (file)
@@ -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
 #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)
 
index c894d8ac5b27a3d00c1d418a33d1d752284be183..b67c41877c1d08ad9467dd5d0540b59726f0c590 100644 (file)
@@ -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)
 
index a7621a2d11aba5a3b9ac055cf6da5cf175fcfde7..b95b8c073c8dd8848ee39e72ed30f7cc9b3c5c20 100644 (file)
@@ -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>
 #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
index 59cd1d4ff737d9473677b20eb0bbc0df3de2cb86..137d9346773f819147b57f458606e43eee7311ac 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2002-2003
+ * (C) Copyright 2002-2005
  * Gary Jennejohn <gj@denx.de>
  *
  * Configuation settings for the TRAB board.
 #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 */
index f771d30e3eb82d04a4c6a2dff1ecee9a9a8d208f..187df71ddb09a10386a75b509d5d30ebdad4206d 100644 (file)
@@ -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
 
 #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
 
index 9b8a5969206e080e03c414d5fa1160c6d5f5952b..fc3739f41d553c32e57035916ac7d35c177a5edd 100644 (file)
@@ -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
  *
 /* 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>
index ee0982e60ae87645a291f645dfd598a75856ca74..b907351f25c5434969731cfa2bb587ecd860eba6 100644 (file)
@@ -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;
index 9e11eb49626c1c8d3f40f95af6ffdfa4b8910782..db8c2c279984c6af7a882bde0a90837338b467fc 100644 (file)
@@ -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;
 }