diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2009-01-21 18:38:51 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2009-01-21 18:38:51 -0600 |
| commit | be4880ebe4355e8782be4af4b337a1b98dffcbe3 (patch) | |
| tree | 8b699181073305221b95f338a2d9107ab1bbfa3f /lib_arm/board.c | |
| parent | 633639587e3596f0dbf5e6247dd3faf80b1d9063 (diff) | |
| parent | 72d15e705bc3983884105cb7755c7ba80e74a0a5 (diff) | |
| download | u-boot-imx-be4880ebe4355e8782be4af4b337a1b98dffcbe3.zip u-boot-imx-be4880ebe4355e8782be4af4b337a1b98dffcbe3.tar.gz u-boot-imx-be4880ebe4355e8782be4af4b337a1b98dffcbe3.tar.bz2 | |
Merge branch 'master' into next
Diffstat (limited to 'lib_arm/board.c')
| -rw-r--r-- | lib_arm/board.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index 4ba1f5e..2358beb 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -42,6 +42,7 @@ #include <command.h> #include <malloc.h> #include <devices.h> +#include <timestamp.h> #include <version.h> #include <net.h> #include <serial.h> @@ -69,7 +70,7 @@ extern void dataflash_print_info(void); #endif const char version_string[] = - U_BOOT_VERSION" (" __DATE__ " - " __TIME__ ")"CONFIG_IDENT_STRING; + U_BOOT_VERSION" (" U_BOOT_DATE " - " U_BOOT_TIME ")"CONFIG_IDENT_STRING; #ifdef CONFIG_DRIVER_CS8900 extern void cs8900_get_enetaddr (uchar * addr); |