Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-riscv into...

[J-u-boot.git] / include / fs_loader.h

diff --git a/include/fs_loader.h b/include/fs_loader.h
index 0be4f17e6320d8385650f4921c20d2536e92dfbf..5eb5b7ab4a105348ab5c0f944bad309c0cfeb01a 100644 (file)
--- a/include/fs_loader.h
+++ b/include/fs_loader.h
@@ -6,22 +6,7 @@
 #ifndef _FS_LOADER_H_
 #define _FS_LOADER_H_
 
-#include <dm.h>
-
-/**
- * struct firmware - A place for storing firmware and its attribute data.
- *
- * This holds information about a firmware and its content.
- *
- * @size: Size of a file
- * @data: Buffer for file
- * @priv: Firmware loader private fields
- */
-struct firmware {
-       size_t size;
-       const u8 *data;
-       void *priv;
-};
+struct udevice;
 
 /**
  * struct phandle_part - A place for storing phandle of node and its partition
@@ -46,34 +31,37 @@ struct phandle_part {
  * @mtdpart: MTD partition for ubi partition.
  * @ubivol: UBI volume-name for ubifsmount.
  */
-struct device_platdata {
+struct device_plat {
        struct phandle_part phandlepart;
        char *mtdpart;
        char *ubivol;
 };
 
-/**
- * release_firmware - Release the resource associated with a firmware image
- * @firmware: Firmware resource to release
- */
-void release_firmware(struct firmware *firmware);
-
 /**
  * request_firmware_into_buf - Load firmware into a previously allocated buffer.
- * @plat: Platform data such as storage and partition firmware loading from.
+ * @dev: An instance of a driver.
  * @name: Name of firmware file.
  * @buf: Address of buffer to load firmware into.
  * @size: Size of buffer.
  * @offset: Offset of a file for start reading into buffer.
- * @firmwarep: Pointer to firmware image.
  *
- * The firmware is loaded directly into the buffer pointed to by @buf and
- * the @firmwarep data member is pointed at @buf.
+ * The firmware is loaded directly into the buffer pointed to by @buf.
  *
  * Return: Size of total read, negative value when error.
  */
-int request_firmware_into_buf(struct device_platdata *plat,
+int request_firmware_into_buf(struct udevice *dev,
                              const char *name,
-                             void *buf, size_t size, u32 offset,
-                             struct firmware **firmwarep);
+                             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