common/image.c remove extra calls to be32_to_cpu in boot_get_fdt

[platform/kernel/u-boot.git] / common / cmd_net.c

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 3cdb07f..44d17db 100644 (file)
--- 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[])
@@ -186,9 +188,9 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char * const argv[])
 
                break;
 
-       default: cmd_usage(cmdtp);
+       default:
                show_boot_progress (-80);
-               return 1;
+               return cmd_usage(cmdtp);
        }
 
        show_boot_progress (80);
@@ -236,10 +238,8 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return -1;
 
        NetPingIP = string_to_ip(argv[1]);
-       if (NetPingIP == 0) {
-               cmd_usage(cmdtp);
-               return -1;
-       }
+       if (NetPingIP == 0)
+               return cmd_usage(cmdtp);
 
        if (NetLoop(PING) < 0) {
                printf("ping failed; host %s is not alive\n", argv[1]);
@@ -342,10 +342,8 @@ U_BOOT_CMD(
 #if defined(CONFIG_CMD_DNS)
 int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       if (argc == 1) {
-               cmd_usage(cmdtp);
-               return -1;
-       }
+       if (argc == 1)
+               return cmd_usage(cmdtp);
 
        /*
         * We should check for a valid hostname: