diff options
| author | Simon Glass <sjg@chromium.org> | 2023-05-10 16:34:46 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-13 09:52:32 -0400 |
| commit | 79f663515a8a55bdcb7496d3db51462b6ff7c0c2 (patch) | |
| tree | 186981198b5434e049fbf3ead359c37bbc590369 /include | |
| parent | c8894348454aef103a29e5afbfe45c0959b9d45b (diff) | |
bootstd: Rename distro and syslinux to extlinux
We use the terms 'distro' to mean extlinux but they are not really the
same. 'Distro' could refer to any method of booting a distribution,
whereas extlinux is a particular method.
Also we sometimes use syslinux, but it is better to use the same term in
all cases.
Rename distro to syslinux and also update bootstd uses of syslinux to use
extlinux instead.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/bootmeth.h | 2 | ||||
| -rw-r--r-- | include/extlinux.h (renamed from include/distro.h) | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/bootmeth.h b/include/bootmeth.h index b12dfd42c90..c3df9702e87 100644 --- a/include/bootmeth.h +++ b/include/bootmeth.h @@ -255,7 +255,7 @@ int bootmeth_setup_iter_order(struct bootflow_iter *iter, bool include_global); * This selects the ordering to use for bootmeths * * @order_str: String containing the ordering. This is a comma-separate list of - * bootmeth-device names, e.g. "syslinux,efi". If empty then a default ordering + * bootmeth-device names, e.g. "extlinux,efi". If empty then a default ordering * is used, based on the sequence number of devices (i.e. using aliases) * Return: 0 if OK, -ENODEV if an unknown bootmeth is mentioned, -ENOMEM if * out of memory, -ENOENT if there are no bootmeth devices diff --git a/include/distro.h b/include/extlinux.h index 2ee145871b2..721ba46371c 100644 --- a/include/distro.h +++ b/include/extlinux.h @@ -4,18 +4,18 @@ * Written by Simon Glass <sjg@chromium.org> */ -#ifndef __distro_h -#define __distro_h +#ifndef __extlinux_h +#define __extlinux_h -#define DISTRO_FNAME "extlinux/extlinux.conf" +#define EXTLINUX_FNAME "extlinux/extlinux.conf" /** - * struct distro_info - useful information for distro_getfile() + * struct extlinux_info - useful information for extlinux_getfile() * * @dev: bootmethod device being used to boot * @bflow: bootflow being booted */ -struct distro_info { +struct extlinux_info { struct udevice *dev; struct bootflow *bflow; struct cmd_tbl *cmdtp; |