diff options
author | Stefan Roese <sr@denx.de> | 2007-08-21 16:33:33 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-08-21 16:33:33 +0200 |
commit | 93f798346033a1f6d22090b47abad4be88243b04 (patch) | |
tree | 45b4d2a887a89572015de3234b04b419bfc11b44 /lib_mips/board.c | |
parent | 3ad63878737a5a2b1e60825bf0a7d601d7a695e7 (diff) | |
parent | 3e66c078003607a7d1d214c15a5f262bc1b4032f (diff) | |
download | u-boot-imx-93f798346033a1f6d22090b47abad4be88243b04.zip u-boot-imx-93f798346033a1f6d22090b47abad4be88243b04.tar.gz u-boot-imx-93f798346033a1f6d22090b47abad4be88243b04.tar.bz2 |
Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
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 b7d3356..91ccec0 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 |