Consolidate mpc5xxx linker scripts

[u-boot] / disk / part_iso.c

diff --git a/disk/part_iso.c b/disk/part_iso.c
index ee8c7c6f29b4d57a456ff77e42e2831d9a5e4a88..8d52097bdbfc58168b2ecb9912c2ae0a69b1cf99 100644 (file)
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -25,9 +25,9 @@
 #include <command.h>
 #include "part_iso.h"
 
-#if ((CONFIG_COMMANDS & CFG_CMD_IDE)   || \
-     (CONFIG_COMMANDS & CFG_CMD_SCSI)  || \
-     (CONFIG_COMMANDS & CFG_CMD_USB)   || \
+#if ((CONFIG_COMMANDS & CFG_CMD_IDE)    || defined(CONFIG_CMD_IDE) || \
+     (CONFIG_COMMANDS & CFG_CMD_SCSI)   || defined(CONFIG_CMD_SCSI) || \
+     (CONFIG_COMMANDS & CFG_CMD_USB)    || defined(CONFIG_CMD_USB) || \
      defined(CONFIG_MMC) || \
      defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_ISO_PARTITION)
 
@@ -87,7 +87,7 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_
                                dev_desc->dev, part_num);
                return (-1);
        }
-       if(strncmp(ppr->stand_ident,"CD001",5)!=0) {
+       if(strncmp((char *)ppr->stand_ident,"CD001",5)!=0) {
                if(verb)
                        printf ("** Wrong ISO Ident: %s on %d:%d **\n",
                                ppr->stand_ident,dev_desc->dev, part_num);
@@ -154,23 +154,23 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_
        /* the validation entry seems to be ok, now search the "partition" */
        entry_num=0;
        offset=0x20;
-       sprintf (info->type, "U-Boot");
+       sprintf ((char *)info->type, "U-Boot");
        switch(dev_desc->if_type) {
                case IF_TYPE_IDE:
                case IF_TYPE_ATAPI:
-                       sprintf (info->name, "hd%c%d\n", 'a' + dev_desc->dev, part_num);
+                       sprintf ((char *)info->name, "hd%c%d\n", 'a' + dev_desc->dev, part_num);
                        break;
                case IF_TYPE_SCSI:
-                       sprintf (info->name, "sd%c%d\n", 'a' + dev_desc->dev, part_num);
+                       sprintf ((char *)info->name, "sd%c%d\n", 'a' + dev_desc->dev, part_num);
                        break;
                case IF_TYPE_USB:
-                       sprintf (info->name, "usbd%c%d\n", 'a' + dev_desc->dev, part_num);
+                       sprintf ((char *)info->name, "usbd%c%d\n", 'a' + dev_desc->dev, part_num);
                        break;
                case IF_TYPE_DOC:
-                       sprintf (info->name, "docd%c%d\n", 'a' + dev_desc->dev, part_num);
+                       sprintf ((char *)info->name, "docd%c%d\n", 'a' + dev_desc->dev, part_num);
                        break;
                default:
-                       sprintf (info->name, "xx%c%d\n", 'a' + dev_desc->dev, part_num);
+                       sprintf ((char *)info->name, "xx%c%d\n", 'a' + dev_desc->dev, part_num);
                        break;
        }
        /* the bootcatalog (including validation Entry) is limited to 2048Bytes