From 79f663515a8a55bdcb7496d3db51462b6ff7c0c2 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 10 May 2023 16:34:46 -0600 Subject: 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 --- include/bootmeth.h | 2 +- include/distro.h | 24 ------------------------ include/extlinux.h | 24 ++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 include/distro.h create mode 100644 include/extlinux.h (limited to 'include') 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/distro.h deleted file mode 100644 index 2ee145871b2..00000000000 --- a/include/distro.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright 2021 Google LLC - * Written by Simon Glass - */ - -#ifndef __distro_h -#define __distro_h - -#define DISTRO_FNAME "extlinux/extlinux.conf" - -/** - * struct distro_info - useful information for distro_getfile() - * - * @dev: bootmethod device being used to boot - * @bflow: bootflow being booted - */ -struct distro_info { - struct udevice *dev; - struct bootflow *bflow; - struct cmd_tbl *cmdtp; -}; - -#endif diff --git a/include/extlinux.h b/include/extlinux.h new file mode 100644 index 00000000000..721ba46371c --- /dev/null +++ b/include/extlinux.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2021 Google LLC + * Written by Simon Glass + */ + +#ifndef __extlinux_h +#define __extlinux_h + +#define EXTLINUX_FNAME "extlinux/extlinux.conf" + +/** + * struct extlinux_info - useful information for extlinux_getfile() + * + * @dev: bootmethod device being used to boot + * @bflow: bootflow being booted + */ +struct extlinux_info { + struct udevice *dev; + struct bootflow *bflow; + struct cmd_tbl *cmdtp; +}; + +#endif -- cgit v1.2.3