diff options
| author | Tom Rini <trini@konsulko.com> | 2025-10-09 13:50:59 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-10-09 13:50:59 -0600 |
| commit | 8cc77c78b0bc44aab44aa00e9a0ceab14ffe2017 (patch) | |
| tree | d2d86c319404adb0d6311615c9c513983dcfc51d /drivers | |
| parent | a1fd7a9589bf150c6f79d3a37fbc426f00a8af94 (diff) | |
| parent | 50fc92938623be4a1cf1993c703812643afc9cdd (diff) | |
Merge patch series "fw_loader: Split from fs_loader into separate library file"
This series from Marek Vasut <marek.vasut+renesas@mailbox.org> splits
the fw_loader "script" code out from the fs_loader code as the former
does not require the latter.
Link: https://lore.kernel.org/r/20250922114926.51984-1-marek.vasut+renesas@mailbox.org
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/fs_loader.c | 47 | ||||
| -rw-r--r-- | drivers/net/phy/mediatek/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/phy/mediatek/mtk-2p5ge.c | 2 |
3 files changed, 2 insertions, 49 deletions
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index d641647e040..2928cf75f89 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -228,53 +228,6 @@ int request_firmware_into_buf(struct udevice *dev, return ret; } -int request_firmware_into_buf_via_script(void *buf, size_t max_size, - const char *script_name, - size_t *retsize) -{ - char *args[2] = { "run", (char *)script_name }; - int ret, repeatable; - ulong addr, size; - - if (!buf || !script_name || !max_size) - return -EINVAL; - - /* Run the firmware loading script */ - ret = cmd_process(0, 2, args, &repeatable, NULL); - if (ret) { - log_err("Firmware loading script '%s' not defined or failed.\n", - script_name); - return -EINVAL; - } - - /* Find out where the firmware got loaded and how long it is */ - addr = env_get_hex("fw_addr", 0); - size = env_get_hex("fw_size", 0); - - /* Clear the variables set by the firmware loading script */ - env_set("fw_addr", NULL); - env_set("fw_size", NULL); - - if (!addr || !size) { - log_err("Firmware address (0x%lx) or size (0x%lx) are invalid.\n", - addr, size); - return -EINVAL; - } - - if (size > max_size) { - log_err("Loaded firmware size 0x%lx exceeded maximum allowed size 0x%zx.\n", - size, max_size); - return -E2BIG; - } - - if (retsize) - *retsize = size; - - memcpy(buf, (void *)addr, size); - - return 0; -} - static int fs_loader_of_to_plat(struct udevice *dev) { u32 phandlepart[2]; diff --git a/drivers/net/phy/mediatek/Kconfig b/drivers/net/phy/mediatek/Kconfig index bbda951e7d9..933271f01fa 100644 --- a/drivers/net/phy/mediatek/Kconfig +++ b/drivers/net/phy/mediatek/Kconfig @@ -6,8 +6,8 @@ config MTK_NET_PHYLIB config PHY_MEDIATEK_2P5GE bool "MediaTek built-in 2.5Gb ethernet PHYs" depends on OF_CONTROL && (TARGET_MT7987 || TARGET_MT7988) + select FW_LOADER select MTK_NET_PHYLIB - select FS_LOADER help Supports MediaTek SoC built-in 2.5Gb ethernet PHYs. diff --git a/drivers/net/phy/mediatek/mtk-2p5ge.c b/drivers/net/phy/mediatek/mtk-2p5ge.c index 0e704bdb04d..4090db0b474 100644 --- a/drivers/net/phy/mediatek/mtk-2p5ge.c +++ b/drivers/net/phy/mediatek/mtk-2p5ge.c @@ -10,7 +10,7 @@ #include <dm/of_access.h> #include <dm/pinctrl.h> #include <dm/ofnode.h> -#include <fs_loader.h> +#include <fw_loader.h> #include <linux/bitfield.h> #include <linux/delay.h> #include <linux/iopoll.h> |