ARM: relocation: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC

[u-boot] / common / cmd_nand.c

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 84b6272950d91cf4baa2d451a75cf12d7d84b6dc..3f1d077ff737cae9938475db03d1820c31da0505 100644 (file)
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -275,8 +275,7 @@ int do_nand_env_oob(cmd_tbl_t *cmdtp, nand_info_t *nand,
        return ret;
 
 usage:
-       cmd_usage(cmdtp);
-       return 1;
+       return cmd_usage(cmdtp);
 }
 
 #endif
@@ -577,11 +576,11 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 #endif
 
 usage:
-       cmd_usage(cmdtp);
-       return 1;
+       return cmd_usage(cmdtp);
 }
 
-U_BOOT_CMD(nand, CONFIG_SYS_MAXARGS, 1, do_nand,
+U_BOOT_CMD(
+       nand, CONFIG_SYS_MAXARGS, 1, do_nand,
        "NAND sub-system",
        "info - show available NAND devices\n"
        "nand device [dev] - show or set current device\n"
@@ -759,9 +758,8 @@ int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 #if defined(CONFIG_CMD_MTDPARTS)
 usage:
 #endif
-               cmd_usage(cmdtp);
                show_boot_progress(-53);
-               return 1;
+               return cmd_usage(cmdtp);
        }
 
        show_boot_progress(53);