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/image-fdt.c | |
| parent | 7af26b1669b75a02e1cfaa68ac526897e790af84 (diff) | |
| download | blackbird-obmc-uboot-f320a4d845ab160dd539888280b6452deebdb3d0.tar.gz blackbird-obmc-uboot-f320a4d845ab160dd539888280b6452deebdb3d0.zip | |
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/image-fdt.c')
| -rw-r--r-- | common/image-fdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/image-fdt.c b/common/image-fdt.c index d99f444de1..203404afb4 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -243,7 +243,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch, ulong load, load_end; void *buf; #if defined(CONFIG_FIT) - const char *fit_uname_config = NULL; + const char *fit_uname_config = images->fit_uname_cfg; const char *fit_uname_fdt = NULL; ulong default_addr; int fdt_noffset; @@ -367,7 +367,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch, fdt_noffset = fit_image_load(images, FIT_FDT_PROP, fdt_addr, &fit_uname_fdt, - fit_uname_config, + &fit_uname_config, arch, IH_TYPE_FLATDT, BOOTSTAGE_ID_FIT_FDT_START, FIT_LOAD_OPTIONAL, &load, &len); |
