summaryrefslogtreecommitdiff
path: root/boot/bootm.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-10-06 17:23:47 -0400
committerTom Rini <trini@konsulko.com>2023-10-06 17:23:47 -0400
commit83aa0ed1e93e1ffac24888d98d37a5b04ed3fb07 (patch)
treefcabaf4a86164f385ede03b654bc69cbffb2a3ee /boot/bootm.c
parentbe2abe73df58a35da9e8d5afb13fccdf1b0faa8e (diff)
parentf69d3d6d10b15872a279aeb10b7c522627aff6c2 (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/bootm.c')
-rw-r--r--boot/bootm.c2
1 files changed, 1 insertions, 1 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>