diff options
| author | Tom Rini <[email protected]> | 2023-10-06 17:23:47 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-10-06 17:23:47 -0400 |
| commit | 83aa0ed1e93e1ffac24888d98d37a5b04ed3fb07 (patch) | |
| tree | fcabaf4a86164f385ede03b654bc69cbffb2a3ee /boot | |
| 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 'boot')
| -rw-r--r-- | boot/bootm.c | 2 | ||||
| -rw-r--r-- | boot/vbe_request.c | 2 | ||||
| -rw-r--r-- | boot/vbe_simple_os.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/boot/bootm.c b/boot/bootm.c index b1c3afe0a3a..8f96a80d425 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -8,6 +8,7 @@ #include <common.h> #include <bootstage.h> #include <cli.h> +#include <command.h> #include <cpu_func.h> #include <env.h> #include <errno.h> @@ -29,7 +30,6 @@ #include "mkimage.h" #endif -#include <command.h> #include <bootm.h> #include <image.h> diff --git a/boot/vbe_request.c b/boot/vbe_request.c index 2f218d4bf97..917251afa1c 100644 --- a/boot/vbe_request.c +++ b/boot/vbe_request.c @@ -187,7 +187,7 @@ static int bootmeth_vbe_ft_fixup(void *ctx, struct event *event) ret = ofnode_add_subnode(dest_parent, name, &dest); if (ret && ret != -EEXIST) return log_msg_ret("add", ret); - ret = ofnode_copy_props(node, dest); + ret = ofnode_copy_props(dest, node); if (ret) return log_msg_ret("cp", ret); diff --git a/boot/vbe_simple_os.c b/boot/vbe_simple_os.c index 3285e438a56..84626cdeaf2 100644 --- a/boot/vbe_simple_os.c +++ b/boot/vbe_simple_os.c @@ -94,7 +94,7 @@ static int bootmeth_vbe_simple_ft_fixup(void *ctx, struct event *event) /* Copy over the vbe properties for fwupd */ log_debug("Fixing up: %s\n", dev->name); - ret = ofnode_copy_props(dev_ofnode(dev), subnode); + ret = ofnode_copy_props(subnode, dev_ofnode(dev)); if (ret) return log_msg_ret("cp", ret); |