diff options
| author | Tom Rini <[email protected]> | 2023-05-14 11:27:18 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-05-14 11:27:18 -0400 |
| commit | 177e506952a8ee34011590c4bd578d191fafb1ca (patch) | |
| tree | 1c4be9b6329df4a1976125e87bf2fd8447990f29 /include | |
| parent | e94fbdd2729fdcd570035d43f67adda8e0dfc115 (diff) | |
| parent | fba0e7380269771bb9587fce84e56a059ebf7d42 (diff) | |
Merge branch '2023-05-13-bootstd-updates-and-improvements'
- Assorted bootstd fixes and cleanups. This should fix problems with
Debian, and make script-based distributions work when BOOTMETH_DISTRO
is enabled now (as BOOTMETH_DISTRO was renamed and then reintroduced).
Diffstat (limited to 'include')
| -rw-r--r-- | include/bootmeth.h | 2 | ||||
| -rw-r--r-- | include/extlinux.h (renamed from include/distro.h) | 10 | ||||
| -rw-r--r-- | include/usb.h | 3 |
3 files changed, 9 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 <[email protected]> */ -#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; diff --git a/include/usb.h b/include/usb.h index 80cb8467203..42b001c3dd5 100644 --- a/include/usb.h +++ b/include/usb.h @@ -11,12 +11,15 @@ #ifndef _USB_H_ #define _USB_H_ +#include <stdbool.h> #include <fdtdec.h> #include <usb_defs.h> #include <linux/usb/ch9.h> #include <asm/cache.h> #include <part.h> +extern bool usb_started; /* flag for the started/stopped USB status */ + /* * The EHCI spec says that we must align to at least 32 bytes. However, * some platforms require larger alignment. |