qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: dtbo: enable depends on CONFIG_CMD_DTIMG 

Change-Id: I04ba7d39fed1b5c6950a3882f04de5420dfcff2e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2018-08-09 11:58:26 +08:00
parent 93cbd3c1e3
commit edac97f481
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-rockchip/resource_img.c
View File

@ -598,7 +598,8 @@ int rockchip_read_dtb_file(void *fdt_addr)
if (ret < 0) if (ret < 0)
return ret; return ret;
#if defined(CONFIG_OF_LIBFDT_OVERLAY) && defined(CONFIG_USING_KERNEL_DTB) #if defined(CONFIG_CMD_DTIMG) && \
defined(CONFIG_OF_LIBFDT_OVERLAY) && defined(CONFIG_USING_KERNEL_DTB)
android_fdt_overlay_apply((void *)fdt_addr); android_fdt_overlay_apply((void *)fdt_addr);
#endif #endif

5
common/android_bootloader.c
View File

@ -476,7 +476,7 @@ out:
} }
#endif #endif
#ifdef CONFIG_OF_LIBFDT_OVERLAY #if defined(CONFIG_CMD_DTIMG) && defined(CONFIG_OF_LIBFDT_OVERLAY)
/* /*
* Default return index 0. * Default return index 0.
@ -841,7 +841,8 @@ int android_bootloader_boot_flow(struct blk_desc *dev_desc,
* dtb and apply overlay in init_kernel_dtb(), so that we don't need to apply * dtb and apply overlay in init_kernel_dtb(), so that we don't need to apply
* again, we would pass the current fdt to kernel. * again, we would pass the current fdt to kernel.
*/ */
#if defined(CONFIG_OF_LIBFDT_OVERLAY) && !defined(CONFIG_USING_KERNEL_DTB) #if defined(CONFIG_CMD_DTIMG) && \
defined(CONFIG_OF_LIBFDT_OVERLAY) && !defined(CONFIG_USING_KERNEL_DTB)
android_fdt_overlay_apply((void *)fdt_addr); android_fdt_overlay_apply((void *)fdt_addr);
#endif #endif
#endif #endif