diff options
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 2 | ||||
| -rw-r--r-- | boot/bootmeth_cros.c | 2 | ||||
| -rw-r--r-- | boot/pxe_utils.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index 4a17deaa3e2..def483a41f1 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -833,7 +833,7 @@ choice prompt "Freescale PBL (or predecessor) load location" depends on RAMBOOT_PBL || ((TARGET_P1010RDB_PA || TARGET_P1010RDB_PB \ || TARGET_P1020RDB_PC || TARGET_P1020RDB_PD || TARGET_P2020RDB) \ - && !CMD_NAND) + && !CMD_NAND) || (TARGET_TURRIS_1X && SYS_MPC85XX_NO_RESETVEC) config SDCARD bool "Freescale PBL (or similar) is found on SD card" diff --git a/boot/bootmeth_cros.c b/boot/bootmeth_cros.c index 1d5fd8b193d..676f550ca25 100644 --- a/boot/bootmeth_cros.c +++ b/boot/bootmeth_cros.c @@ -163,7 +163,7 @@ static int scan_part(struct udevice *blk, int partnum, if (uuid_str_to_bin(info->type_guid, type.b, UUID_STR_FORMAT_GUID)) return log_msg_ret("typ", -EINVAL); - if (memcmp(&cros_kern_type, &type, sizeof(type))) + if (guidcmp(&cros_kern_type, &type)) return log_msg_ret("typ", -ENOEXEC); /* Make a buffer for the header information */ diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 53d6cf700b2..4e27842b088 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -1470,7 +1470,6 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) override_num = label->num; } - if (label_override) { if (override_num) default_num = override_num; |