diff options
| author | wdenk <wdenk> | 2003-04-27 22:52:51 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-04-27 22:52:51 +0000 |
| commit | 4532cb696eb717419022dbaa8d408e7df7df7b68 (patch) | |
| tree | 2b791870499676f1c93b1e8bcc94ace26787ad8e /common | |
| parent | 02c9bed451b36f3b1f11d5fe617da4fe4b9f9ab7 (diff) | |
| download | u-boot-imx-4532cb696eb717419022dbaa8d408e7df7df7b68.zip u-boot-imx-4532cb696eb717419022dbaa8d408e7df7df7b68.tar.gz u-boot-imx-4532cb696eb717419022dbaa8d408e7df7df7b68.tar.bz2 | |
* LWMON extensions:
- Splashscreen support
- modem support
- sysmon support
- temperature dependend enabling of LCD
* Allow booting from old "PPCBoot" disk partitions
* Add support for TQM8255 Board / MPC8255 CPU
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 94fc89b..9441db2 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 9b5c69b..f3d0c72 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 389f0fc..8a3f471 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); |