aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/fm
diff options
context:
space:
mode:
authorSean Anderson <sean.anderson@seco.com>2022-12-29 11:53:01 -0500
committerTom Rini <trini@konsulko.com>2023-01-12 14:06:16 -0500
commitf4426fd68d604fc3f823979d7f643938894df167 (patch)
treeb98d01f4747bca8190e3b6d1337eb6bf661731d3 /drivers/net/fm
parente4f0cc5ddf6ad24e06fcd6a25bbaaf3d55fa0899 (diff)
downloadu-boot-f4426fd68d604fc3f823979d7f643938894df167.zip
u-boot-f4426fd68d604fc3f823979d7f643938894df167.tar.gz
u-boot-f4426fd68d604fc3f823979d7f643938894df167.tar.bz2
net: fm: Support loading firmware from a filesystem
This adds a new method to load Fman firmware from a filesystem. This allows users to use regular files instead of hard-coded offsets for the firmware. Signed-off-by: Sean Anderson <sean.anderson@seco.com> Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Diffstat (limited to 'drivers/net/fm')
-rw-r--r--drivers/net/fm/fm.c25
1 files changed, 24 insertions, 1 deletions
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index 457200e..e1fba24 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -5,6 +5,7 @@
*/
#include <common.h>
#include <env.h>
+#include <fs_loader.h>
#include <image.h>
#include <malloc.h>
#include <asm/io.h>
@@ -452,7 +453,29 @@ int fm_init_common(int index, struct ccsr_fman *reg, const char *firmware_name)
int fm_init_common(int index, struct ccsr_fman *reg, const char *firmware_name)
{
int rc;
-#if defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR)
+#if defined(CONFIG_SYS_QE_FMAN_FW_IN_FS)
+ struct udevice *fs_loader;
+ void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH);
+
+ if (!addr)
+ return -ENOMEM;
+
+ rc = get_fs_loader(&fs_loader);
+ if (rc) {
+ debug("could not get fs loader: %d\n", rc);
+ return rc;
+ }
+
+ if (!firmware_name)
+ firmware_name = "fman.itb";
+
+ rc = request_firmware_into_buf(fs_loader, firmware_name, addr,
+ CONFIG_SYS_QE_FMAN_FW_LENGTH, 0);
+ if (rc < 0) {
+ debug("could not request %s: %d\n", firmware_name, rc);
+ return rc;
+ }
+#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR)
void *addr = (void *)CONFIG_SYS_FMAN_FW_ADDR;
#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_NAND)
size_t fw_length = CONFIG_SYS_QE_FMAN_FW_LENGTH;