diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_ide.c | 3 | ||||
| -rw-r--r-- | common/cmd_scsi.c | 3 | ||||
| -rw-r--r-- | common/cmd_usb.c | 3 | 
3 files changed, 6 insertions, 3 deletions
| diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 94fc89b42..9441db2dd 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -404,7 +404,8 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])  		SHOW_BOOT_PROGRESS (-1);  		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); diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index 9b5c69b32..f3d0c7216 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -262,7 +262,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); diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 389f0fc01..8a3f47113 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -376,7 +376,8 @@ int do_usbboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])  		info.size=2880;  		printf("error reading partinfo...try to boot raw\n");  	} -	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); |