new 405ep defines added

[u-boot] / common / cmd_scsi.c

diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index 9b5c69b32b4712510e3f7d060ba62735111b4adb..2da9ac9160bd4e763fedd476ba2ddb056dc39502 100644 (file)
--- a/common/cmd_scsi.c
+++ b/common/cmd_scsi.c
@@ -30,11 +30,9 @@
 
 #include <common.h>
 #include <command.h>
-#include <cmd_boot.h>
 #include <asm/processor.h>
 #include <scsi.h>
 #include <image.h>
-#include <cmd_disk.h>
 #include <pci.h>
 
 
@@ -181,7 +179,6 @@ removable:
 }
 
 
-
 void scsi_init(void)
 {
        int busdevfunc;
@@ -206,7 +203,6 @@ block_dev_desc_t * scsi_get_dev(int dev)
 }
 
 
-
 /******************************************************************************
  * scsi boot command intepreter. Derived from diskboot
  */
@@ -262,7 +258,8 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                printf("error reading partinfo\n");
                return 1;
        }
-       if (strncmp(info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) {
+       if ((strncmp(info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) &&
+           (strncmp(info.type, BOOT_PART_COMP, sizeof(info.type)) != 0)) {
                printf ("\n** Invalid partition type \"%.32s\""
                        " (expect \"" BOOT_PART_TYPE "\")\n",
                        info.type);
@@ -493,7 +490,6 @@ void scsi_ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len)
 }
 
 
-
 /* Trim trailing blanks, and NUL-terminate string
  */
 void scsi_trim_trail (unsigned char *str, unsigned int len)
@@ -593,5 +589,3 @@ void scsi_setup_inquiry(ccb * pccb)
 }
 
 #endif /* #if (CONFIG_COMMANDS & CFG_CMD_SCSI) */
-
-