diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-08-13 02:04:23 +0800 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-08-13 14:48:12 +0800 |
| commit | 5bc3870d6763eb0bb28a8d5d85061e4a75e8a861 (patch) | |
| tree | b85fad74876f3d2378c965b36750f290f2fd0080 /arch/arm/lib/bootm.c | |
| parent | 58713d32746d49ad39ba17658fe82f1b98b80b2e (diff) | |
| download | barebox-5bc3870d6763eb0bb28a8d5d85061e4a75e8a861.tar.gz barebox-5bc3870d6763eb0bb28a8d5d85061e4a75e8a861.tar.xz | |
arm/bootm: fix initrd_start init
initrd_start need to be init to data->initrd_address and updated only if the
addr is invalid.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm/lib/bootm.c')
| -rw-r--r-- | arch/arm/lib/bootm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index a8840fe42d..c5b76ea979 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -58,7 +58,9 @@ static int __do_bootm_linux(struct image_data *data, int swap) kernel = data->os_res->start + data->os_entry; - if (data->initrd_file && data->initrd_address == UIMAGE_INVALID_ADDRESS) { + initrd_start = data->initrd_address; + + if (data->initrd_file && initrd_start == UIMAGE_INVALID_ADDRESS) { initrd_start = data->os_res->start + SZ_8M; if (bootm_verbose(data)) { |