diff --git a/arch/arm/mach-rockchip/boot_rkimg.c b/arch/arm/mach-rockchip/boot_rkimg.c index 60f104f0cf..a2fec12269 100644 --- a/arch/arm/mach-rockchip/boot_rkimg.c +++ b/arch/arm/mach-rockchip/boot_rkimg.c @@ -23,9 +23,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -457,6 +459,18 @@ int rockchip_read_dtb_file(void *fdt_addr) u32 size; int ret = -1; +#ifdef CONFIG_ROCKCHIP_FIT_IMAGE + if (ret) { + hash_size = 0; + ret = rockchip_read_fit_dtb(fdt_addr, &hash, &hash_size); + } +#endif +#ifdef CONFIG_ROCKCHIP_UIMAGE + if (ret) { + hash_size = 0; + ret = rockchip_read_uimage_dtb(fdt_addr, &hash, &hash_size); + } +#endif #ifdef CONFIG_ROCKCHIP_EARLY_DISTRO_DTB if (ret) { hash_size = 0; @@ -469,7 +483,6 @@ int rockchip_read_dtb_file(void *fdt_addr) ret = rockchip_read_resource_dtb(fdt_addr, &hash, &hash_size); } #endif - if (ret) { printf("Failed to load DTB\n"); return ret;