Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[u-boot] / common / cmd_mtdparts.c

diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c
index 84108c244689e959f5a7dbdfce7b36c921f57a9d..2d1446ecb8d5ea9784da8f08e36c4a321dbe8490 100644 (file)
--- a/common/cmd_mtdparts.c
+++ b/common/cmd_mtdparts.c
@@ -137,14 +137,12 @@
 #if defined(MTDIDS_DEFAULT)
 static const char *const mtdids_default = MTDIDS_DEFAULT;
 #else
-#warning "MTDIDS_DEFAULT not defined!"
 static const char *const mtdids_default = NULL;
 #endif
 
 #if defined(MTDPARTS_DEFAULT)
 static const char *const mtdparts_default = MTDPARTS_DEFAULT;
 #else
-#warning "MTDPARTS_DEFAULT not defined!"
 static const char *const mtdparts_default = NULL;
 #endif
 
@@ -1264,8 +1262,10 @@ static void list_partitions(void)
        }
 
        printf("\ndefaults:\n");
-       printf("mtdids  : %s\n", mtdids_default);
-       printf("mtdparts: %s\n", mtdparts_default);
+       printf("mtdids  : %s\n",
+               mtdids_default ? mtdids_default : "none");
+       printf("mtdparts: %s\n",
+               mtdparts_default ? mtdparts_default : "none");
 }
 
 /**
@@ -1863,7 +1863,7 @@ U_BOOT_CMD(
        chpart, 2,      0,      do_chpart,
        "change active partition",
        "part-id\n"
-       "    - change active partition (e.g. part-id = nand0,1)\n"
+       "    - change active partition (e.g. part-id = nand0,1)"
 );
 
 U_BOOT_CMD(
@@ -1898,6 +1898,6 @@ U_BOOT_CMD(
        "<size>     := standard linux memsize OR '-' to denote all remaining space\n"
        "<offset>   := partition start offset within the device\n"
        "<name>     := '(' NAME ')'\n"
-       "<ro-flag>  := when set to 'ro' makes partition read-only (not used, passed to kernel)\n"
+       "<ro-flag>  := when set to 'ro' makes partition read-only (not used, passed to kernel)"
 );
 /***************************************************/