diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 | 
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 | 
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /board/netstar/eeprom.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | olio-uboot-2014.01-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.xz olio-uboot-2014.01-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip | |
Merge branch 'fixes' into cleanups
Conflicts:
	board/atmel/atngw100/atngw100.c
	board/atmel/atstk1000/atstk1000.c
	cpu/at32ap/at32ap700x/gpio.c
	include/asm-avr32/arch-at32ap700x/clk.h
	include/configs/atngw100.h
	include/configs/atstk1002.h
	include/configs/atstk1003.h
	include/configs/atstk1004.h
	include/configs/atstk1006.h
	include/configs/favr-32-ezkit.h
	include/configs/hammerhead.h
	include/configs/mimc200.h
Diffstat (limited to 'board/netstar/eeprom.c')
| -rw-r--r-- | board/netstar/eeprom.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/board/netstar/eeprom.c b/board/netstar/eeprom.c index 0de594b65..5806128cf 100644 --- a/board/netstar/eeprom.c +++ b/board/netstar/eeprom.c @@ -26,6 +26,7 @@  #include <common.h>  #include <exports.h> +#include <timestamp.h>  #include "../drivers/net/smc91111.h"  #define SMC_BASE_ADDRESS CONFIG_SMC91111_BASE @@ -173,7 +174,7 @@ int eeprom(int argc, char *argv[])  	/* Print help message */  	if (argv[1][1] == 'h') {  		printf("VoiceBlue EEPROM writer\n"); -		printf("Built: %s at %s\n", __DATE__ , __TIME__ ); +		printf("Built: %s at %s\n", U_BOOT_DATE, U_BOOT_TIME);  		printf("Usage:\n\t<mac_address> [<element_1>] [<...>]\n");  		return 0;  	} |