diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-09 14:00:25 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-19 11:48:17 +0100 |
| commit | f3e173f6c2a086f33e7d661a92418c479d33648a (patch) | |
| tree | 3b11da17fc7d91c909654f9697965d85123d0020 /arch/arm/lib/bootm.c | |
| parent | 4979d8e9d5f6bc51700ca0f9e4ceaf153bd9f77e (diff) | |
| download | barebox-f3e173f6c2a086f33e7d661a92418c479d33648a.tar.gz barebox-f3e173f6c2a086f33e7d661a92418c479d33648a.tar.xz | |
ARM bootm: only use concatenated oftree when no other is available
When an oftree is already specified use it. This lets the user
boot a kernel with an oftree he provided himself rather than
hardcoding the concatenated one.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/lib/bootm.c')
| -rw-r--r-- | arch/arm/lib/bootm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index b7dc96ee3b..dc29004792 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -138,6 +138,9 @@ static int do_bootz_linux_fdt(int fd, struct image_data *data) u32 end; + if (data->oftree) + return -ENXIO; + header = &__header; ret = read(fd, header, sizeof(*header)); if (ret < sizeof(*header)) |