diff options
| author | Tom Rini <trini@ti.com> | 2012-11-20 10:46:30 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-11-20 10:46:30 -0700 |
| commit | d6bc7dcc0347765c4621c253ea68b07985d8c1f0 (patch) | |
| tree | 4819c732811a2fca3c79f09873988f08e8213912 /common/cmd_bootm.c | |
| parent | 7bae844f2dacd1b75f65e37624778a15e132f5e1 (diff) | |
| parent | 2a7abdd3d3430183e85c637ec7d98b90d2f5ef47 (diff) | |
| download | u-boot-imx-d6bc7dcc0347765c4621c253ea68b07985d8c1f0.zip u-boot-imx-d6bc7dcc0347765c4621c253ea68b07985d8c1f0.tar.gz u-boot-imx-d6bc7dcc0347765c4621c253ea68b07985d8c1f0.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-fdt
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index d256ddf..4dbe952 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -949,8 +949,19 @@ static void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, * node */ bootstage_mark(BOOTSTAGE_ID_FIT_NO_UNIT_NAME); +#ifdef CONFIG_FIT_BEST_MATCH + if (fit_uname_config) + cfg_noffset = + fit_conf_get_node(fit_hdr, + fit_uname_config); + else + cfg_noffset = + fit_conf_find_compat(fit_hdr, + gd->fdt_blob); +#else cfg_noffset = fit_conf_get_node(fit_hdr, fit_uname_config); +#endif if (cfg_noffset < 0) { bootstage_error(BOOTSTAGE_ID_FIT_NO_UNIT_NAME); return NULL; |