diff options
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 8 | ||||
| -rw-r--r-- | boot/bootmeth_efi_mgr.c | 4 | ||||
| -rw-r--r-- | boot/image-fit.c | 4 | ||||
| -rw-r--r-- | boot/pxe_utils.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index be6bb6d4535..ae6f09a6ede 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -431,12 +431,12 @@ config BOOT_DEFAULTS_CMDS select CMD_FAT select CMD_FS_GENERIC select CMD_PART if PARTITIONS - select CMD_DHCP if CMD_NET && !NO_NET - select CMD_PING if CMD_NET && !NO_NET - select CMD_PXE if CMD_NET && !NO_NET + select CMD_DHCP if CMD_NET && NET + select CMD_PING if CMD_NET && NET + select CMD_PXE if CMD_NET && NET select CMD_BOOTI if ARM64 && LMB select CMD_BOOTZ if ARM && !ARM64 && LMB - imply CMD_MII if CMD_NET && !NO_NET + imply CMD_MII if CMD_NET && NET config BOOT_DEFAULTS bool # Common defaults for standard boot and distroboot diff --git a/boot/bootmeth_efi_mgr.c b/boot/bootmeth_efi_mgr.c index 05fc35d01a9..6e70c36ad99 100644 --- a/boot/bootmeth_efi_mgr.c +++ b/boot/bootmeth_efi_mgr.c @@ -58,8 +58,8 @@ static int efi_mgr_read_bootflow(struct udevice *dev, struct bootflow *bflow) } ret = efi_init_obj_list(); - if (ret) - return log_msg_ret("init", ret); + if (ret != EFI_SUCCESS) + return ret; /* Enable this method if the "BootOrder" UEFI exists. */ bootorder = efi_get_var(u"BootOrder", &efi_global_variable_guid, diff --git a/boot/image-fit.c b/boot/image-fit.c index 067ad236081..b0fcaf6e17f 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -2282,7 +2282,7 @@ int fit_image_load(struct bootm_headers *images, ulong addr, printf(" Loading %s from 0x%08lx to 0x%08lx\n", prop_name, data, load); } else { - load = data; /* No load address specified */ + load = data; /* load address specified but set to 0 */ } comp = IH_COMP_NONE; @@ -2311,7 +2311,7 @@ int fit_image_load(struct bootm_headers *images, ulong addr, } len = load_end - load; } else if (load_op != FIT_LOAD_IGNORED && image_type == IH_TYPE_FLATDT && - ((uintptr_t)buf & 7)) { + (load & 7)) { loadbuf = aligned_alloc(8, len); load = map_to_sysmem(loadbuf); memcpy(loadbuf, buf, len); diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 419ab1f1b0e..8c1310dabeb 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -546,7 +546,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) char *zboot_argv[] = { "zboot", NULL, "0", NULL, NULL }; char *kernel_addr = NULL; char *initrd_addr_str = NULL; - char initrd_filesize[10]; + char initrd_filesize[17]; char initrd_str[28]; char mac_str[29] = ""; char ip_str[68] = ""; |