diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-06 17:23:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-06 17:23:47 -0400 |
| commit | 83aa0ed1e93e1ffac24888d98d37a5b04ed3fb07 (patch) | |
| tree | fcabaf4a86164f385ede03b654bc69cbffb2a3ee /common/spl/spl_ext.c | |
| parent | be2abe73df58a35da9e8d5afb13fccdf1b0faa8e (diff) | |
| parent | f69d3d6d10b15872a279aeb10b7c522627aff6c2 (diff) | |
Merge branch '2023-10-06-spl-prepare-for-universal-payload'
To quote the author:
This series tidies up SPL a little and adds some core ofnode functions
needed to support Universal Payload. It also includes a few minor
fix-ups for sandbox.
For SPL the changes include CONFIG naming, removing various #ifdefs and
tidying up the FIT code.
One notable piece of the ofnode improvements is support for flattening a
livetree. This should be useful in future as we move FDT fixups to use
the ofnode API.
Diffstat (limited to 'common/spl/spl_ext.c')
| -rw-r--r-- | common/spl/spl_ext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 2bf34344391..902564a6077 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -97,7 +97,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, puts("spl: ext4fs_open failed\n"); goto defaults; } - err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, 0, filelen, &actlen); + err = ext4fs_read((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0, filelen, &actlen); if (err < 0) { printf("spl: error reading image %s, err - %d, falling back to default\n", file, err); @@ -127,7 +127,7 @@ defaults: if (err < 0) puts("spl: ext4fs_open failed\n"); - err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, 0, filelen, &actlen); + err = ext4fs_read((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0, filelen, &actlen); if (err < 0) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: error reading image %s, err - %d\n", |