diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 2439c36..0855907 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -135,7 +135,7 @@ * 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 affab24..a38d7e0 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -19,6 +19,7 @@ #include #include #include +#include static LIST_HEAD(handler_list); @@ -185,6 +186,24 @@ 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 bdd5477..b172c05 100644 --- a/include/boot.h +++ b/include/boot.h @@ -112,6 +112,7 @@ 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)