summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-12 20:44:46 +0200
committerWolfgang Denk <wd@denx.de>2010-10-12 20:44:46 +0200
commit0ee8746a93e29a3d884f19598409a3bea8ff51ab (patch)
tree1544d350005f0ff1403c21e2c795575e51901ae1 /common
parent456be17dbe0e22ee2be9fafa1ea8888ddf6bd514 (diff)
parent1ca6d0df3ecb028e989f3489b95d021f4497477b (diff)
downloadtalos-obmc-uboot-0ee8746a93e29a3d884f19598409a3bea8ff51ab.tar.gz
talos-obmc-uboot-0ee8746a93e29a3d884f19598409a3bea8ff51ab.zip
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'common')
-rw-r--r--common/cmd_net.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 3ffb9df1de..44d17db19c 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -54,6 +54,7 @@ U_BOOT_CMD(
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
+#ifdef CONFIG_CMD_RARP
int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
return netboot_common (RARP, cmdtp, argc, argv);
@@ -64,6 +65,7 @@ U_BOOT_CMD(
"boot image via network using RARP/TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
+#endif
#if defined(CONFIG_CMD_DHCP)
int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
OpenPOWER on IntegriCloud