ColdFire: Get information from the correct GCC

[u-boot] / common / cmd_jffs2.c

diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 3e6061a5202c7a341b405574a6fa98f4639cb447..1b67e73f1119d03864b23afeaa197ed2533546f2 100644 (file)
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -85,7 +85,7 @@
  */
 
 /*
- * JFFS2/CRAMFS/ROMFS support
+ * JFFS2/CRAMFS support
  */
 #include <common.h>
 #include <command.h>
@@ -93,9 +93,6 @@
 #include <jffs2/jffs2.h>
 #include <linux/list.h>
 #include <linux/ctype.h>
-
-#if defined(CONFIG_CMD_JFFS2)
-
 #include <cramfs/cramfs_fs.h>
 
 #if defined(CONFIG_CMD_NAND)
@@ -170,15 +167,19 @@ struct list_head devices;
 static struct mtd_device *current_dev = NULL;
 static u8 current_partnum = 0;
 
+#if defined(CONFIG_CMD_CRAMFS)
 extern int cramfs_check (struct part_info *info);
 extern int cramfs_load (char *loadoffset, struct part_info *info, char *filename);
 extern int cramfs_ls (struct part_info *info, char *filename);
 extern int cramfs_info (struct part_info *info);
-
-extern int romfs_check (struct part_info *info);
-extern int romfs_load (char *loadoffset, struct part_info *info, char *filename);
-extern int romfs_ls (struct part_info *info, char *filename);
-extern int romfs_info (struct part_info *info);
+#else
+/* defining empty macros for function names is ugly but avoids ifdef clutter
+ * all over the code */
+#define cramfs_check(x)                (0)
+#define cramfs_load(x,y,z)     (-1)
+#define cramfs_ls(x,y)         (0)
+#define cramfs_info(x)         (0)
+#endif
 
 static struct part_info* jffs2_part_info(struct mtd_device *dev, unsigned int part_num);
 
@@ -1879,22 +1880,14 @@ int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        if ((part = jffs2_part_info(current_dev, current_partnum))){
 
-               /* check partition type for JFFS2, cramfs, romfs */
-               if (cramfs_check(part)) {
-                       fsname = "CRAMFS";
-               } else if (romfs_check(part)) {
-                       fsname = "ROMFS";
-               } else {
-                       fsname = "JFFS2";
-               }
+               /* check partition type for cramfs */
+               fsname = (cramfs_check(part) ? "CRAMFS" : "JFFS2");
                printf("### %s loading '%s' to 0x%lx\n", fsname, filename, offset);
 
                if (cramfs_check(part)) {
                        size = cramfs_load ((char *) offset, part, filename);
-               } else if (romfs_check(part)){
-                       size = romfs_load ((char *) offset, part, filename);
                } else {
-                       /* if this is not cramfs or romfs assume jffs2 */
+                       /* if this is not cramfs assume jffs2 */
                        size = jffs2_1pass_load((char *)offset, part, filename);
                }
 
@@ -1941,10 +1934,8 @@ int do_jffs2_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                /* check partition type for cramfs */
                if (cramfs_check(part)) {
                        ret = cramfs_ls (part, filename);
-               } else if (romfs_check(part)) {
-                       ret = romfs_ls (part, filename);
                } else {
-                       /* if this is not cramfs or romfs assume jffs2 */
+                       /* if this is not cramfs assume jffs2 */
                        ret = jffs2_1pass_ls(part, filename);
                }
 
@@ -1966,6 +1957,7 @@ int do_jffs2_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 int do_jffs2_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        struct part_info *part;
+       char *fsname;
        int ret;
 
        /* make sure we are in sync with env variables */
@@ -1975,17 +1967,13 @@ int do_jffs2_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if ((part = jffs2_part_info(current_dev, current_partnum))){
 
                /* check partition type for cramfs */
-               puts("### filesystem type is ");
+               fsname = (cramfs_check(part) ? "CRAMFS" : "JFFS2");
+               printf("### filesystem type is %s\n", fsname);
 
                if (cramfs_check(part)) {
-                       puts("CRAMFS\n");
                        ret = cramfs_info (part);
-               } else if (romfs_check(part)) {
-                       puts("ROMFS\n");
-                       ret = romfs_info (part);
                } else {
-                       /* if this is not cramfs or romfs assume jffs2 */
-                       puts("JFFS2\n");
+                       /* if this is not cramfs assume jffs2 */
                        ret = jffs2_1pass_info(part);
                }
 
@@ -2209,5 +2197,3 @@ U_BOOT_CMD(
 #endif /* #ifdef CONFIG_JFFS2_CMDLINE */
 
 /***************************************************/
-
-#endif