bootstd: Use bootdev instead of bootdevice

It seems better to call this a 'bootdev' since this is name used in the
documentation. The older 'Bootdevice' name is no-longer used and may cause
confusion with the 'bootdevice' environment variable.

Update throughout to use bootdev.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/boot/bootflow.c b/boot/bootflow.c
index 8f2cb876bb49a57949aa2e9d1142167d3af39122..487552fa28c0721866a6ed62ca39fa1e7ee68032 100644 (file)
--- a/boot/bootflow.c
+++ b/boot/bootflow.c
@@ -315,14 +315,14 @@ static int bootflow_check(struct bootflow_iter *iter, struct bootflow *bflow)
 
        /* If we got a valid bootflow, return it */
        if (!ret) {
-               log_debug("Bootdevice '%s' part %d method '%s': Found bootflow\n",
+               log_debug("Bootdev '%s' part %d method '%s': Found bootflow\n",
                          dev->name, iter->part, iter->method->name);
                return 0;
        }
 
        /* Unless there is nothing more to try, move to the next device */
        else if (ret != BF_NO_MORE_PARTS && ret != -ENOSYS) {
-               log_debug("Bootdevice '%s' part %d method '%s': Error %d\n",
+               log_debug("Bootdev '%s' part %d method '%s': Error %d\n",
                          dev->name, iter->part, iter->method->name, ret);
                /*
                 * For 'all' we return all bootflows, even

diff --git a/drivers/mmc/mmc_bootdev.c b/drivers/mmc/mmc_bootdev.c
index b57b8a62276d8bbfc5d3b50a803be71efbe886a0..55ecead2ddf9a32fad67e27d7199c986eec1f043 100644 (file)
--- a/drivers/mmc/mmc_bootdev.c
+++ b/drivers/mmc/mmc_bootdev.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Bootdevice for MMC
+ * Bootdev for MMC
  *
  * Copyright 2021 Google LLC
  * Written by Simon Glass <sjg@chromium.org>

diff --git a/drivers/scsi/scsi_bootdev.c b/drivers/scsi/scsi_bootdev.c
index 991013fe1ef25df63645269a6dff601a82f02745..218221fa30622704c22ab29ab02121bb0095eef3 100644 (file)
--- a/drivers/scsi/scsi_bootdev.c
+++ b/drivers/scsi/scsi_bootdev.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Bootdevice for USB
+ * Bootdev for SCSI
  *
  * Copyright 2021 Google LLC
  * Written by Simon Glass <sjg@chromium.org>

diff --git a/drivers/usb/host/usb_bootdev.c b/drivers/usb/host/usb_bootdev.c
index 06e8f61aa1c53d586615ecac910f278cc74f4906..7fa1c601dff52fdb166fa96be700a34ac7653748 100644 (file)
--- a/drivers/usb/host/usb_bootdev.c
+++ b/drivers/usb/host/usb_bootdev.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Bootdevice for USB
+ * Bootdev for USB
  *
  * Copyright 2021 Google LLC
  * Written by Simon Glass <sjg@chromium.org>

diff --git a/fs/sandbox/host_bootdev.c b/fs/sandbox/host_bootdev.c
index 0d12ee4ef74fda3f3982d914a0c142deceec5d96..3ef53627608af1f2429e86ee03eb16264d20d397 100644 (file)
--- a/fs/sandbox/host_bootdev.c
+++ b/fs/sandbox/host_bootdev.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Bootdevice for MMC
+ * Bootdev for sandbox host
  *
  * Copyright 2021 Google LLC
  * Written by Simon Glass <sjg@chromium.org>

diff --git a/include/bootdev.h b/include/bootdev.h
index e72ef3650f7ce55c430553e7055bff4cd740dbfc..1533adfe50650a73ca954e3cab462ac52828e9cd 100644 (file)
--- a/include/bootdev.h
+++ b/include/bootdev.h
@@ -200,7 +200,7 @@ void bootdev_clear_bootflows(struct udevice *dev);
  * All fields in @bflow must be set up. Note that @bflow->dev is used to add the
  * bootflow to that device.
  *
- * @dev: Bootdevice device to add to
+ * @dev: Bootdev device to add to
  * @bflow: Bootflow to add. Note that fields within bflow must be allocated
  *     since this function takes over ownership of these. This functions makes
  *     a copy of @bflow itself (without allocating its fields again), so the

diff --git a/include/bootflow.h b/include/bootflow.h
index f20f575030f13599b5c4a78e09c8b381d8907ce1..018d021b8107efa80ecdf55e8e72ceb98815ea95 100644 (file)
--- a/include/bootflow.h
+++ b/include/bootflow.h
@@ -58,7 +58,7 @@ enum bootflow_flags_t {
  *
  * @bm_node: Points to siblings in the same bootdev
  * @glob_node: Points to siblings in the global list (all bootdev)
- * @dev: Bootdevice device which produced this bootflow
+ * @dev: Bootdev device which produced this bootflow
  * @blk: Block device which contains this bootflow, NULL if this is a network
  *     device or sandbox 'host' device
  * @part: Partition number (0 for whole device)

diff --git a/net/eth_bootdev.c b/net/eth_bootdev.c
index f7b4196f78db64da52bd8d631e7a8386aa1bbb8b..869adf8cbbd31900339e432347417087937f949f 100644 (file)
--- a/net/eth_bootdev.c
+++ b/net/eth_bootdev.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Bootdevice for ethernet (uses PXE)
+ * Bootdev for ethernet (uses PXE)
  *
  * Copyright 2021 Google LLC
  * Written by Simon Glass <sjg@chromium.org>