net: Add more #ifdefs for tftpput to reduce code size
authorSimon Glass <sjg@chromium.org>
Thu, 27 Oct 2011 06:24:29 +0000 (06:24 +0000)
committerWolfgang Denk <wd@denx.de>
Thu, 27 Oct 2011 21:53:58 +0000 (23:53 +0200)
If CONFIG_CMD_TFTPPUT is not enabled, we want minimal code size impact
on the tftp code. This introduces a few more #ifdefs.

Signed-off-by: Simon Glass <sjg@chromium.org>
net/tftp.c

index 81f9af430e594c08b509b64cb7463ff0f6a9b216..49997073872eef56dabd9a294b49f0f907e10b9f 100644 (file)
@@ -332,8 +332,12 @@ TftpSend(void)
        case STATE_SEND_WRQ:
                xp = pkt;
                s = (ushort *)pkt;
+#ifdef CONFIG_CMD_TFTPPUT
                *s++ = htons(TftpState == STATE_SEND_RRQ ? TFTP_RRQ :
                        TFTP_WRQ);
+#else
+               *s++ = htons(TFTP_RRQ);
+#endif
                pkt = (uchar *)s;
                strcpy((char *)pkt, tftp_filename);
                pkt += strlen(tftp_filename) + 1;
@@ -730,7 +734,12 @@ void TftpStart(enum proto_t protocol)
 
        printf("Using %s device\n", eth_get_name());
        printf("TFTP %s server %pI4; our IP address is %pI4",
-              protocol == TFTPPUT ? "to" : "from", &TftpRemoteIP, &NetOurIP);
+#ifdef CONFIG_CMD_TFTPPUT
+              protocol == TFTPPUT ? "to" : "from",
+#else
+               "from",
+#endif
+               &TftpRemoteIP, &NetOurIP);
 
        /* Check if we need to send across this subnet */
        if (NetOurGatewayIP && NetOurSubnetMask) {