Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 07:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

bootstd: Use bootdev instead of bootdevice

Browse source 
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>
This commit is contained in:
Simon Glass 2023-07-12 09:04:32 -06:00 committed by Bin Meng
parent 3c2e531cb8
commit 4de979f664
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot/bootflow.c
View file

@ -315,14 +315,14 @@ static int bootflow_check(struct bootflow_iter *iter, struct bootflow *bflow)
/* If we got a valid bootflow, return it */ /* If we got a valid bootflow, return it */
if (!ret) { 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); dev->name, iter->part, iter->method->name);
return 0; return 0;
} }
/* Unless there is nothing more to try, move to the next device */ /* Unless there is nothing more to try, move to the next device */
else if (ret != BF_NO_MORE_PARTS && ret != -ENOSYS) { 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); dev->name, iter->part, iter->method->name, ret);
/* /*
* For 'all' we return all bootflows, even * For 'all' we return all bootflows, even

2
drivers/mmc/mmc_bootdev.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* /*
* Bootdevice for MMC * Bootdev for MMC
* *
* Copyright 2021 Google LLC * Copyright 2021 Google LLC
* Written by Simon Glass <sjg@chromium.org> * Written by Simon Glass <sjg@chromium.org>

2
drivers/scsi/scsi_bootdev.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* /*
* Bootdevice for USB * Bootdev for SCSI
* *
* Copyright 2021 Google LLC * Copyright 2021 Google LLC
* Written by Simon Glass <sjg@chromium.org> * Written by Simon Glass <sjg@chromium.org>

2
drivers/usb/host/usb_bootdev.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* /*
* Bootdevice for USB * Bootdev for USB
* *
* Copyright 2021 Google LLC * Copyright 2021 Google LLC
* Written by Simon Glass <sjg@chromium.org> * Written by Simon Glass <sjg@chromium.org>

2
fs/sandbox/host_bootdev.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* /*
* Bootdevice for MMC * Bootdev for sandbox host
* *
* Copyright 2021 Google LLC * Copyright 2021 Google LLC
* Written by Simon Glass <sjg@chromium.org> * Written by Simon Glass <sjg@chromium.org>

2
include/bootdev.h
View file

@ -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 * All fields in @bflow must be set up. Note that @bflow->dev is used to add the
* bootflow to that device. * 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 * @bflow: Bootflow to add. Note that fields within bflow must be allocated
* since this function takes over ownership of these. This functions makes * since this function takes over ownership of these. This functions makes
* a copy of @bflow itself (without allocating its fields again), so the * a copy of @bflow itself (without allocating its fields again), so the

2
include/bootflow.h
View file

@ -58,7 +58,7 @@ enum bootflow_flags_t {
* *
* @bm_node: Points to siblings in the same bootdev * @bm_node: Points to siblings in the same bootdev
* @glob_node: Points to siblings in the global list (all 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 * @blk: Block device which contains this bootflow, NULL if this is a network
* device or sandbox 'host' device * device or sandbox 'host' device
* @part: Partition number (0 for whole device) * @part: Partition number (0 for whole device)

2
net/eth_bootdev.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* /*
* Bootdevice for ethernet (uses PXE) * Bootdev for ethernet (uses PXE)
* *
* Copyright 2021 Google LLC * Copyright 2021 Google LLC
* Written by Simon Glass <sjg@chromium.org> * Written by Simon Glass <sjg@chromium.org>