imx: nandbcb: add support for writing BCB only

[oweals/u-boot.git] / cmd / bootm.c

diff --git a/cmd/bootm.c b/cmd/bootm.c
index 953a57de33996b7b2c3c28cb320fc8420fcc76e2..8279f2b7cc632f14f7cf2155583dfb0710797cfa 100644 (file)
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -11,7 +10,7 @@
 #include <common.h>
 #include <bootm.h>
 #include <command.h>
-#include <environment.h>
+#include <env.h>
 #include <errno.h>
 #include <image.h>
 #include <malloc.h>
@@ -138,7 +137,7 @@ int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd)
 {
-       const char *ep = getenv("autostart");
+       const char *ep = env_get("autostart");
 
        if (ep && !strcmp(ep, "yes")) {
                char *local_args[2];
@@ -202,7 +201,7 @@ U_BOOT_CMD(
 #if defined(CONFIG_CMD_BOOTD)
 int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       return run_command(getenv("bootcmd"), flag);
+       return run_command(env_get("bootcmd"), flag);
 }
 
 U_BOOT_CMD(
@@ -250,7 +249,7 @@ static int image_info(ulong addr)
        printf("\n## Checking Image at %08lx ...\n", addr);
 
        switch (genimg_get_format(hdr)) {
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
        case IMAGE_FORMAT_LEGACY:
                puts("   Legacy image found\n");
                if (!image_check_magic(hdr)) {
@@ -338,7 +337,7 @@ static int do_imls_nor(void)
                                goto next_sector;
 
                        switch (genimg_get_format(hdr)) {
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
                        case IMAGE_FORMAT_LEGACY:
                                if (!image_check_hcrc(hdr))
                                        goto next_sector;
@@ -465,7 +464,7 @@ static int do_imls_nand(void)
        printf("\n");
 
        for (nand_dev = 0; nand_dev < CONFIG_SYS_MAX_NAND_DEVICE; nand_dev++) {
-               mtd = nand_info[nand_dev];
+               mtd = get_nand_dev_by_index(nand_dev);
                if (!mtd->name || !mtd->size)
                        continue;
 
@@ -486,7 +485,7 @@ static int do_imls_nand(void)
                        }
 
                        switch (genimg_get_format(buffer)) {
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
                        case IMAGE_FORMAT_LEGACY:
                                header = (const image_header_t *)buffer;