diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-09 10:15:35 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-14 12:36:03 +0100 |
| commit | 76ccd96f4a92c028ea531a098b58356208b0815b (patch) | |
| tree | 5971a9c383bb12d7d2a2e5e01dc07b96f011de5b /arch/arm/lib | |
| parent | 1984af4f28bdabc88881ec8d04eea039855b62e4 (diff) | |
| download | barebox-76ccd96f4a92c028ea531a098b58356208b0815b.tar.gz barebox-76ccd96f4a92c028ea531a098b58356208b0815b.tar.xz | |
bootm: introduce bootm_load_initrd helper
Make the bootm handlers simpler by factoring out an initrd load
function.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/bootm.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 6f84cb309d..56e42bc588 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -26,12 +26,13 @@ static int __do_bootm_linux(struct image_data *data, int swap) { unsigned long kernel; unsigned long initrd_start = 0, initrd_size = 0, initrd_end = 0; + int ret; kernel = data->os_res->start + data->os_entry; initrd_start = data->initrd_address; - if (data->initrd_file && initrd_start == UIMAGE_INVALID_ADDRESS) { + if (initrd_start == UIMAGE_INVALID_ADDRESS) { initrd_start = data->os_res->start + SZ_8M; if (bootm_verbose(data)) { @@ -40,16 +41,9 @@ static int __do_bootm_linux(struct image_data *data, int swap) } } - if (data->initrd) { - data->initrd_res = uimage_load_to_sdram(data->initrd, - data->initrd_num, initrd_start); - if (!data->initrd_res) - return -ENOMEM; - } else if (data->initrd_file) { - data->initrd_res = file_to_sdram(data->initrd_file, initrd_start); - if (!data->initrd_res) - return -ENOMEM; - } + ret = bootm_load_initrd(data, initrd_start); + if (ret) + return ret; if (data->initrd_res) { initrd_start = data->initrd_res->start; |