diff options
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Makefile | 3 | ||||
| -rw-r--r-- | boot/bootm.c | 8 | ||||
| -rw-r--r-- | boot/image-board.c | 2 | ||||
| -rw-r--r-- | boot/image-fdt.c | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/boot/Makefile b/boot/Makefile index 0db4672b050..5424b6fafcc 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -30,8 +30,9 @@ obj-$(CONFIG_$(SPL_TPL_)QFW) += bootmeth_qfw.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL -obj-$(CONFIG_$(SPL_TPL_)CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o +obj-$(CONFIG_CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o obj-$(CONFIG_$(SPL_TPL_)EXPO) += bootflow_menu.o +obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o endif obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o diff --git a/boot/bootm.c b/boot/bootm.c index 15fce8ad95e..2eec60ec7b5 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -100,7 +100,7 @@ static int bootm_pre_load(struct cmd_tbl *cmdtp, int flag, int argc, ulong data_addr = bootm_data_addr(argc, argv); int ret = 0; - if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD)) + if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD)) ret = image_pre_load(data_addr); if (ret) @@ -226,7 +226,7 @@ static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc, } if (images.os.type == IH_TYPE_KERNEL_NOLOAD) { - if (CONFIG_IS_ENABLED(CMD_BOOTI) && + if (IS_ENABLED(CONFIG_CMD_BOOTI) && images.os.arch == IH_ARCH_ARM64) { ulong image_addr; ulong image_size; @@ -313,7 +313,7 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start, return 1; } - if (CONFIG_IS_ENABLED(CMD_FDT)) + if (IS_ENABLED(CONFIG_CMD_FDT)) set_working_fdt_addr(map_to_sysmem(images.ft_addr)); #endif @@ -893,7 +893,7 @@ static const void *boot_get_kernel(struct cmd_tbl *cmdtp, int flag, int argc, &fit_uname_config, &fit_uname_kernel); - if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD)) + if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD)) img_addr += image_load_offset; bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC); diff --git a/boot/image-board.c b/boot/image-board.c index e5d71a3d541..25b60ec30b3 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -927,7 +927,7 @@ int image_setup_linux(struct bootm_headers *images) int ret; /* This function cannot be called without lmb support */ - if (!CONFIG_IS_ENABLED(LMB)) + if (!IS_ENABLED(CONFIG_LMB)) return -EFAULT; if (CONFIG_IS_ENABLED(OF_LIBFDT)) boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree); diff --git a/boot/image-fdt.c b/boot/image-fdt.c index b830a0ab418..714d05d1a53 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -272,7 +272,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) *of_flat_tree = of_start; *of_size = of_len; - if (CONFIG_IS_ENABLED(CMD_FDT)) + if (IS_ENABLED(CONFIG_CMD_FDT)) set_working_fdt_addr(map_to_sysmem(*of_flat_tree)); return 0; @@ -638,7 +638,7 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, /* Update ethernet nodes */ fdt_fixup_ethernet(blob); -#if CONFIG_IS_ENABLED(CMD_PSTORE) +#if IS_ENABLED(CONFIG_CMD_PSTORE) /* Append PStore configuration */ fdt_fixup_pstore(blob); #endif |