[PATCH 1/1] net: Exclude code based on selected protocol
Sanjeev Premi
premi at ti.com
Thu Dec 24 08:55:37 EST 2009
Exclude the code for TFTP/NFS if either of the
protocols is not selected.
Signed-off-by: Sanjeev Premi <premi at ti.com>
---
commands/net.c | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/commands/net.c b/commands/net.c
index df06227..8071c9b 100644
--- a/commands/net.c
+++ b/commands/net.c
@@ -77,6 +77,7 @@ void netboot_update_env(void)
setenv ("domain", NetOurNISDomain);
}
+#ifdef CONFIG_NET_TFTP
static int do_tftpb (cmd_tbl_t *cmdtp, int argc, char *argv[])
{
return netboot_common (TFTP, cmdtp, argc, argv);
@@ -92,6 +93,8 @@ BAREBOX_CMD_START(tftp)
BAREBOX_CMD_HELP(cmd_tftp_help)
BAREBOX_CMD_END
+#endif
+
/**
* @page tftp_command tftp
*
@@ -157,9 +160,14 @@ BAREBOX_CMD_END
int net_store_fd;
+#ifdef CONFIG_NET_TFTP
extern void TftpStart(char *); /* Begin TFTP get */
+#endif
+#ifdef CONFIG_NET_NFS
extern void NfsStart(char *);
+#endif
+#if defined(CONFIG_NET_NFS) || defined(CONFIG_NET_TFTP)
static int
netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
{
@@ -188,11 +196,15 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
goto out;
switch (proto) {
+#ifdef CONFIG_NET_TFTP
case TFTP:
TftpStart(remotefile);
break;
+#endif
+#ifdef CONFIG_NET_NFS
case NFS:
NfsStart(remotefile);
+#endif
default:
break;
}
@@ -209,6 +221,7 @@ out:
close(net_store_fd);
return rcode;
}
+#endif /* defined(CONFIG_NET_NFS) || defined(CONFIG_NET_TFTP) */
#ifdef CONFIG_NET_CDP
--
1.6.2.2
More information about the barebox
mailing list