diff options
author | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 |
commit | f2c2a937d8c4a44f63ff88bf82023e03a29497a2 (patch) | |
tree | fa8f7c9fb65d10259e76c40c52cf8277947424d4 /lib_mips | |
parent | b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff) | |
parent | 5728be389e65fd47f34b33c2596271eb4db751ae (diff) | |
download | device_goldelico_gta04_u-boot-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.gz device_goldelico_gta04_u-boot-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.bz2 device_goldelico_gta04_u-boot-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.zip |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'lib_mips')
-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 |