diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 | 
| commit | b706d63559aeec352bc72dd86d7d5423c15f6a60 (patch) | |
| tree | fdeda4d61970fef239d9d66ecd851fa46cfe5ec0 /lib_mips/board.c | |
| parent | c8603cfbd4573379a6076c9c208545ba2bbf019a (diff) | |
| parent | 594e79838ce5078a90d0c27abb2b2d61d5f8e8a7 (diff) | |
| download | olio-uboot-2014.01-b706d63559aeec352bc72dd86d7d5423c15f6a60.tar.xz olio-uboot-2014.01-b706d63559aeec352bc72dd86d7d5423c15f6a60.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'lib_mips/board.c')
| -rw-r--r-- | lib_mips/board.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/lib_mips/board.c b/lib_mips/board.c index b7d335641..91ccec04d 100644 --- a/lib_mips/board.c +++ b/lib_mips/board.c @@ -399,18 +399,18 @@ void board_init_r (gd_t *id, ulong dest_addr)  	if ((s = getenv ("loadaddr")) != NULL) {  		load_addr = simple_strtoul (s, NULL, 16);  	} -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if defined(CONFIG_CMD_NET)  	if ((s = getenv ("bootfile")) != NULL) {  		copy_filename (BootFile, s, sizeof (BootFile));  	} -#endif	/* CFG_CMD_NET */ +#endif  #if defined(CONFIG_MISC_INIT_R)  	/* miscellaneous platform dependent initialisations */  	misc_init_r ();  #endif -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if defined(CONFIG_CMD_NET)  #if defined(CONFIG_NET_MULTI)  	puts ("Net:   ");  #endif |