diff options
| -rw-r--r-- | arch/arc/lib/bootm.c | 2 | ||||
| -rw-r--r-- | arch/arm/lib/bootm.c | 2 | ||||
| -rw-r--r-- | arch/m68k/lib/bootm.c | 2 | ||||
| -rw-r--r-- | arch/microblaze/lib/bootm.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/lib/bootm.c | 2 | ||||
| -rw-r--r-- | arch/riscv/lib/bootm.c | 2 | ||||
| -rw-r--r-- | arch/sandbox/lib/bootm.c | 2 | ||||
| -rw-r--r-- | arch/x86/lib/bootm.c | 2 | ||||
| -rw-r--r-- | boot/image-board.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index 07b2c1540d..2dd003445f 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -29,7 +29,7 @@ static int boot_prep_linux(struct bootm_headers *images) { int ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index e414ef8267..c56285738a 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -199,7 +199,7 @@ static void boot_prep_linux(struct bootm_headers *images) { char *commandline = env_get("bootargs"); - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { panic("FDT creation failed!"); diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index c1c9bdceb5..f18bed235d 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -60,7 +60,7 @@ int do_bootm_linux(int flag, int argc, char *const argv[], } set_clocks_in_mhz(kbd); - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) goto error; diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 4a5421497e..930384f401 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -73,7 +73,7 @@ static void boot_jump_linux(struct bootm_headers *images, int flag) static void boot_prep_linux(struct bootm_headers *images) { - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { printf("FDT creation failed! hanging..."); diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 7b392b06bc..910121ec9c 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -214,7 +214,7 @@ static int boot_body_linux(struct bootm_headers *images) if (ret) return ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c index f5f8b4c733..276677a5e2 100644 --- a/arch/riscv/lib/bootm.c +++ b/arch/riscv/lib/bootm.c @@ -64,7 +64,7 @@ static void announce_and_cleanup(int fake) static void boot_prep_linux(struct bootm_headers *images) { - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { printf("FDT creation failed! hanging..."); diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index 28f4a746fb..dc8b8e46cb 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -55,7 +55,7 @@ static int boot_prep_linux(struct bootm_headers *images) { int ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 04e475bdc2..873e2bc176 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -78,7 +78,7 @@ static int boot_prep_linux(struct bootm_headers *images) size_t len; int ret; - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { puts("FDT creation failed! hanging..."); diff --git a/boot/image-board.c b/boot/image-board.c index e5d71a3d54..25b60ec30b 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); |