diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:52:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:52:34 +0100 |
| commit | ca10989374ffb6f08fde864a95c623fc7557b8e8 (patch) | |
| tree | f87522919e6b55c7f7dcab5bc4e9e4e37eaa2a49 /arch/ppc | |
| parent | fd6fe68e95bb418456973cfa4b1760d9060ba4df (diff) | |
| parent | 0c66005aeaeb85e247e715bd18ac3b621481e425 (diff) | |
| download | barebox-ca10989374ffb6f08fde864a95c623fc7557b8e8.tar.gz barebox-ca10989374ffb6f08fde864a95c623fc7557b8e8.tar.xz | |
Merge branch 'for-next/bootm'
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/lib/ppclinux.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c index 7c30ac3386..e25efecd43 100644 --- a/arch/ppc/lib/ppclinux.c +++ b/arch/ppc/lib/ppclinux.c @@ -47,9 +47,11 @@ static int do_bootm_linux(struct image_data *data) { void (*kernel)(void *, void *, unsigned long, unsigned long, unsigned long); + int ret; - if (!data->os_res) - return -EINVAL; + ret = bootm_load_os(data, data->os_address); + if (ret) + return ret; data->oftree = of_get_fixed_tree(data->of_root_node); if (!data->oftree) { |