diff options
| author | Simon Glass <sjg@chromium.org> | 2013-07-10 23:08:10 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-12 10:32:39 -0400 |
| commit | f320a4d845ab160dd539888280b6452deebdb3d0 (patch) | |
| tree | 82ab3ab1b74dcfa79dcd7de4acf0d3f7c27a3e0f /common/cmd_bootm.c | |
| parent | 7af26b1669b75a02e1cfaa68ac526897e790af84 (diff) | |
| download | u-boot-imx-f320a4d845ab160dd539888280b6452deebdb3d0.zip u-boot-imx-f320a4d845ab160dd539888280b6452deebdb3d0.tar.gz u-boot-imx-f320a4d845ab160dd539888280b6452deebdb3d0.tar.bz2 | |
bootm: Use selected configuration for ramdisk and fdt
If a specific configuraion is selected by the bootm command, e.g. with
'bootm 84000000#recoveryconf' we must honour this for not just the kernel,
but also the ramdisk and FDT.
In the conversion to using a common fit_image_load() function for loading
images from FITs (commits a51ec63 and 53f375f) this feature was lost.
Reinstate it by passing the selected configuration back from
fit_image_load() to boot_get_kernel(), then use this configuration
(which is stored in images->fit_uname_cfg) in both boot_get_ramdisk()
and boot_get_fdt().
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 9985531..2694c66 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -988,7 +988,7 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, case IMAGE_FORMAT_FIT: os_noffset = fit_image_load(images, FIT_KERNEL_PROP, img_addr, - &fit_uname_kernel, fit_uname_config, + &fit_uname_kernel, &fit_uname_config, IH_ARCH_DEFAULT, IH_TYPE_KERNEL, BOOTSTAGE_ID_FIT_KERNEL_START, FIT_LOAD_IGNORED, os_data, os_len); @@ -997,6 +997,7 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, images->fit_hdr_os = map_sysmem(img_addr, 0); images->fit_uname_os = fit_uname_kernel; + images->fit_uname_cfg = fit_uname_config; images->fit_noffset_os = os_noffset; break; #endif |