diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-14 10:54:42 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-22 08:15:15 +0100 |
| commit | 0bb6e4c533211e70a4481c8d9128fd74aaa38c66 (patch) | |
| tree | d2111f302ccc55f29289558e97236ae829b96f29 | |
| parent | 3c0cf270c228dca8b5f7af3c4ac32cfeb91b508b (diff) | |
| download | barebox-0bb6e4c533211e70a4481c8d9128fd74aaa38c66.tar.gz barebox-0bb6e4c533211e70a4481c8d9128fd74aaa38c66.tar.xz | |
bootm: introduce bootm_get_os_size
ARM do_bootm_linux is not only called with uImages but also with
raw images, so we can't use uimage_get_size() here. Introduce
bootm_get_os_size() which handles the different image types.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/lib/bootm.c | 2 | ||||
| -rw-r--r-- | common/bootm.c | 19 | ||||
| -rw-r--r-- | include/boot.h | 1 |
3 files changed, 21 insertions, 1 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 2439c36a45..0855907aec 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -135,7 +135,7 @@ static int do_bootm_linux(struct image_data *data) * relocate itself before decompression. */ load_address = mem_start + PAGE_ALIGN( - uimage_get_size(data->os, data->os_num) * 4); + bootm_get_os_size(data) * 4); if (bootm_verbose(data)) printf("no OS load address, defaulting to 0x%08lx\n", load_address); diff --git a/common/bootm.c b/common/bootm.c index affab24831..a38d7e0326 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -19,6 +19,7 @@ #include <libfile.h> #include <globalvar.h> #include <init.h> +#include <linux/stat.h> static LIST_HEAD(handler_list); @@ -185,6 +186,24 @@ int bootm_load_devicetree(struct image_data *data, unsigned long load_address) return 0; } +int bootm_get_os_size(struct image_data *data) +{ + int ret; + + if (data->os) + return uimage_get_size(data->os, data->os_num); + + if (data->os_file) { + struct stat s; + ret = stat(data->os_file, &s); + if (ret) + return ret; + return s.st_size; + } + + return -EINVAL; +} + static int bootm_open_os_uimage(struct image_data *data) { int ret; diff --git a/include/boot.h b/include/boot.h index bdd5477d35..b172c05b67 100644 --- a/include/boot.h +++ b/include/boot.h @@ -112,6 +112,7 @@ static inline int linux_bootargs_overwrite(const char *bootargs) int bootm_load_os(struct image_data *data, unsigned long load_address); int bootm_load_initrd(struct image_data *data, unsigned long load_address); int bootm_load_devicetree(struct image_data *data, unsigned long load_address); +int bootm_get_os_size(struct image_data *data); #define UIMAGE_SOME_ADDRESS (UIMAGE_INVALID_ADDRESS - 1) |