sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Sascha Hauer 2013-01-09 14:00:25 +01:00
parent 4979d8e9d5
commit f3e173f6c2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/lib/bootm.c
View File

@ -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))