diff options
author | Stefano Babic <sbabic@denx.de> | 2021-10-21 13:57:38 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2021-10-21 13:58:13 +0200 |
commit | 5fac11e6d5ab350429b8c8ddf47d3d3877ca89d1 (patch) | |
tree | a6fd50ca6f8a79b0647469871fa99223a55d8a96 /arch/arm/lib/bootm.c | |
parent | e03aa34bdf97f96ad478f7a105482d8231b98aa6 (diff) | |
parent | 79b8849d4c1e73df2a79a1d5a5f6166d0dd67a12 (diff) | |
download | u-boot-5fac11e6d5ab350429b8c8ddf47d3d3877ca89d1.zip u-boot-5fac11e6d5ab350429b8c8ddf47d3d3877ca89d1.tar.gz u-boot-5fac11e6d5ab350429b8c8ddf47d3d3877ca89d1.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/arm/lib/bootm.c')
-rw-r--r-- | arch/arm/lib/bootm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index dd6a693..a59a5e6 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -199,7 +199,7 @@ static void boot_prep_linux(bootm_headers_t *images) { char *commandline = env_get("bootargs"); - if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) { #ifdef CONFIG_OF_LIBFDT debug("using: FDT\n"); if (image_setup_linux(images)) { @@ -356,7 +356,7 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) bootstage_mark(BOOTSTAGE_ID_RUN_OS); announce_and_cleanup(fake); - if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len) + if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) r2 = (unsigned long)images->ft_addr; else r2 = gd->bd->bi_boot_params; |