Merge patch series "mtd: spi-nor: Remove recently added nor->addr_width == 3 test"

[J-u-boot.git] / boot / bootmeth-uclass.c

diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c
index 3b3e0614dafa01de3149e62aefde2feb43db6f8a..5b5fea39b3b3925375477ab41e2288f4ef4c7358 100644 (file)
--- a/boot/bootmeth-uclass.c
+++ b/boot/bootmeth-uclass.c
@@ -6,7 +6,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <blk.h>
 #include <bootflow.h>
 #include <bootmeth.h>
@@ -61,6 +60,18 @@ int bootmeth_set_bootflow(struct udevice *dev, struct bootflow *bflow,
        return ops->set_bootflow(dev, bflow, buf, size);
 }
 
+#if CONFIG_IS_ENABLED(BOOTSTD_FULL)
+int bootmeth_read_all(struct udevice *dev, struct bootflow *bflow)
+{
+       const struct bootmeth_ops *ops = bootmeth_get_ops(dev);
+
+       if (!ops->read_all)
+               return -ENOSYS;
+
+       return ops->read_all(dev, bflow);
+}
+#endif /* BOOTSTD_FULL */
+
 int bootmeth_boot(struct udevice *dev, struct bootflow *bflow)
 {
        const struct bootmeth_ops *ops = bootmeth_get_ops(dev);
@@ -240,18 +251,32 @@ int bootmeth_set_order(const char *order_str)
        return 0;
 }
 
-/**
- * setup_fs() - Set up read to read a file
- *
- * We must redo the setup before each filesystem operation. This function
- * handles that, including setting the filesystem type if a block device is not
- * being used
- *
- * @bflow: Information about file to try
- * @desc: Block descriptor to read from (NULL if not a block device)
- * Return: 0 if OK, -ve on error
- */
-static int setup_fs(struct bootflow *bflow, struct blk_desc *desc)
+int bootmeth_set_property(const char *name, const char *property, const char *value)
+{
+       int ret;
+       int len;
+       struct udevice *dev;
+       const struct bootmeth_ops *ops;
+
+       len = strlen(name);
+
+       ret = uclass_find_device_by_namelen(UCLASS_BOOTMETH, name, len,
+                                           &dev);
+       if (ret) {
+               printf("Unknown bootmeth '%s'\n", name);
+               return ret;
+       }
+
+       ops = bootmeth_get_ops(dev);
+       if (!ops->set_property) {
+               printf("set_property not found\n");
+               return -ENODEV;
+       }
+
+       return ops->set_property(dev, property, value);
+}
+
+int bootmeth_setup_fs(struct bootflow *bflow, struct blk_desc *desc)
 {
        int ret;
 
@@ -288,7 +313,7 @@ int bootmeth_try_file(struct bootflow *bflow, struct blk_desc *desc,
        log_debug("   %s - err=%d\n", path, ret);
 
        /* Sadly FS closes the file after fs_size() so we must redo this */
-       ret2 = setup_fs(bflow, desc);
+       ret2 = bootmeth_setup_fs(bflow, desc);
        if (ret2)
                return log_msg_ret("fs", ret2);
 
@@ -301,32 +326,6 @@ int bootmeth_try_file(struct bootflow *bflow, struct blk_desc *desc,
        return 0;
 }
 
-static int alloc_file(const char *fname, uint size, void **bufp)
-{
-       loff_t bytes_read;
-       ulong addr;
-       char *buf;
-       int ret;
-
-       buf = malloc(size + 1);
-       if (!buf)
-               return log_msg_ret("buf", -ENOMEM);
-       addr = map_to_sysmem(buf);
-
-       ret = fs_read(fname, addr, 0, size, &bytes_read);
-       if (ret) {
-               free(buf);
-               return log_msg_ret("read", ret);
-       }
-       if (size != bytes_read)
-               return log_msg_ret("bread", -EIO);
-       buf[size] = '\0';
-
-       *bufp = buf;
-
-       return 0;
-}
-
 int bootmeth_alloc_file(struct bootflow *bflow, uint size_limit, uint align)
 {
        void *buf;
@@ -338,7 +337,7 @@ int bootmeth_alloc_file(struct bootflow *bflow, uint size_limit, uint align)
        if (size > size_limit)
                return log_msg_ret("chk", -E2BIG);
 
-       ret = alloc_file(bflow->fname, bflow->size, &buf);
+       ret = fs_read_alloc(bflow->fname, bflow->size, align, &buf);
        if (ret)
                return log_msg_ret("all", ret);
 
@@ -363,18 +362,18 @@ int bootmeth_alloc_other(struct bootflow *bflow, const char *fname,
        if (bflow->blk)
                desc = dev_get_uclass_plat(bflow->blk);
 
-       ret = setup_fs(bflow, desc);
+       ret = bootmeth_setup_fs(bflow, desc);
        if (ret)
                return log_msg_ret("fs", ret);
 
        ret = fs_size(path, &size);
        log_debug("   %s - err=%d\n", path, ret);
 
-       ret = setup_fs(bflow, desc);
+       ret = bootmeth_setup_fs(bflow, desc);
        if (ret)
                return log_msg_ret("fs", ret);
 
-       ret = alloc_file(path, size, &buf);
+       ret = fs_read_alloc(path, size, 0, &buf);
        if (ret)
                return log_msg_ret("all", ret);
 
@@ -395,7 +394,7 @@ int bootmeth_common_read_file(struct udevice *dev, struct bootflow *bflow,
        if (bflow->blk)
                desc = dev_get_uclass_plat(bflow->blk);
 
-       ret = setup_fs(bflow, desc);
+       ret = bootmeth_setup_fs(bflow, desc);
        if (ret)
                return log_msg_ret("fs", ret);
 
@@ -405,7 +404,7 @@ int bootmeth_common_read_file(struct udevice *dev, struct bootflow *bflow,
        if (size > *sizep)
                return log_msg_ret("spc", -ENOSPC);
 
-       ret = setup_fs(bflow, desc);
+       ret = bootmeth_setup_fs(bflow, desc);
        if (ret)
                return log_msg_ret("fs", ret);
 
@@ -421,7 +420,7 @@ int bootmeth_common_read_file(struct udevice *dev, struct bootflow *bflow,
 /**
  * on_bootmeths() - Update the bootmeth order
  *
- * This will check for a valid baudrate and only apply it if valid.
+ * This will check for a valid list of bootmeths and only apply it if valid.
  */
 static int on_bootmeths(const char *name, const char *value, enum env_op op,
                        int flags)