Correct SPL uses of LMB

This converts 9 usages of this option to the non-SPL form, since there is
no SPL_LMB defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index 07b2c15..2dd0034 100644 (file)
--- 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 e414ef8..c562857 100644 (file)
--- 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 c1c9bdc..f18bed2 100644 (file)
--- 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 4a54214..930384f 100644 (file)
--- 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 7b392b0..910121e 100644 (file)
--- 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 f5f8b4c..276677a 100644 (file)
--- 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 28f4a74..dc8b8e4 100644 (file)
--- 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 04e475b..873e2bc 100644 (file)
--- 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 e5d71a3..25b60ec 100644 (file)
--- 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);