diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-15 20:12:32 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-15 20:12:32 +0100 |
| commit | 84fd8a956cda82b54c85d8047c6f7ed7ec6879c5 (patch) | |
| tree | f55b22184765392e3d93609e068880ede6911f40 /commands/bootm.c | |
| parent | 1576bbd2a22ee4f9c5e6162297472a00892c7c71 (diff) | |
| parent | 14aac3f1972e8873d2fbab643d0dca1c746760f7 (diff) | |
| download | barebox-84fd8a956cda82b54c85d8047c6f7ed7ec6879c5.tar.gz barebox-84fd8a956cda82b54c85d8047c6f7ed7ec6879c5.tar.xz | |
Merge branch 'pu/ppc-oftree' into next
Diffstat (limited to 'commands/bootm.c')
| -rw-r--r-- | commands/bootm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/commands/bootm.c b/commands/bootm.c index 453ae543a8..f98a51c559 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -37,6 +37,7 @@ #include <fs.h> #include <errno.h> #include <boot.h> +#include <of.h> #include <rtc.h> #include <init.h> #include <magicvar.h> @@ -143,6 +144,10 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[]) } } +#ifdef CONFIG_OFTREE + data.oftree = of_get_fixed_tree(); +#endif + if (optind == argc) { ret = COMMAND_ERROR_USAGE; goto err_out; |