diff options
| author | Tom Rini <[email protected]> | 2023-01-12 17:05:41 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-01-12 17:05:41 -0500 |
| commit | 87c9e117bf57d6bb42c5521a3f6ec9ca7d97e5fa (patch) | |
| tree | 9a2a90d475abd35c8945bb3af7aa0c14bfc149f7 /include | |
| parent | f58885d002302b8047446a6a15f7376bb7b1ea32 (diff) | |
| parent | 48b3ecbedf8208845ac5956a3fb8817269fafedd (diff) | |
Merge branch '2023-01-12-further-assorted-general-updates'
- Bring in a number of assorted updates, some of which have been waiting
around for a bit. Make silent console really be silent, get rid of
gpio_hog_probe_all, add RNG for imx6, make net/fm use fs_loader, get
rid of a bad __weak usage and set distro_bootpart_uuid in another case.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/gpio.h | 8 | ||||
| -rw-r--r-- | include/config_distro_bootcmd.h | 3 | ||||
| -rw-r--r-- | include/fs_loader.h | 12 |
3 files changed, 15 insertions, 8 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 0fcf70983fb..dd0bdf2315e 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -462,14 +462,6 @@ int dm_gpio_lookup_name(const char *name, struct gpio_desc *desc); int gpio_hog_lookup_name(const char *name, struct gpio_desc **desc); /** - * gpio_hog_probe_all() - probe all gpio devices with - * gpio-hog subnodes. - * - * @return: Returns return value from device_probe() - */ -int gpio_hog_probe_all(void); - -/** * gpio_lookup_name - Look up a GPIO name and return its details * * This is used to convert a named GPIO into a device, offset and GPIO diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index c3a2414b914..9d2a225e7eb 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -521,6 +521,9 @@ "if fstype ${devtype} " \ "${devnum}:${distro_bootpart} " \ "bootfstype; then " \ + "part uuid ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "distro_bootpart_uuid ; " \ "run scan_dev_for_boot; " \ "fi; " \ "done; " \ diff --git a/include/fs_loader.h b/include/fs_loader.h index 8de7cb18dc7..5eb5b7ab4a1 100644 --- a/include/fs_loader.h +++ b/include/fs_loader.h @@ -52,4 +52,16 @@ struct device_plat { int request_firmware_into_buf(struct udevice *dev, const char *name, void *buf, size_t size, u32 offset); + +/** + * get_fs_loader() - Get the chosen filesystem loader + * @dev: Where to store the device + * + * This gets a filesystem loader device based on the value of + * /chosen/firmware-loader. If no such property exists, it returns a + * firmware loader which is configured by environmental variables. + * + * Return: 0 on success, negative value on error + */ +int get_fs_loader(struct udevice **dev); #endif |