summaryrefslogtreecommitdiff
path: root/lib_mips
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-06-11 19:03:03 -0500
committerWolfgang Denk <wd@denx.de>2007-07-04 00:23:17 +0200
commit0c505db0a0dc1f670b13ce3b4d3fbf1ec5b3cbd2 (patch)
treebdaf55b34bb47c67b2d19bc382a7f42af3928914 /lib_mips
parent73f032021ec5f13cda8faa4e34b6de80960eb86f (diff)
downloadu-boot-imx-0c505db0a0dc1f670b13ce3b4d3fbf1ec5b3cbd2.zip
u-boot-imx-0c505db0a0dc1f670b13ce3b4d3fbf1ec5b3cbd2.tar.gz
u-boot-imx-0c505db0a0dc1f670b13ce3b4d3fbf1ec5b3cbd2.tar.bz2
lib_*/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).
This is a compatibility step that allows both the older form and the new form to co-exist for a while until the older can be removed entirely. All transformations are of the form: Before: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) After: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT) Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'lib_mips')
-rw-r--r--lib_mips/board.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib_mips/board.c b/lib_mips/board.c
index b7d3356..654c5af 100644
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -399,7 +399,7 @@ 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 (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile));
}
@@ -410,7 +410,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
misc_init_r ();
#endif
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
#if defined(CONFIG_NET_MULTI)
puts ("Net: ");
#endif