summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Go <sangch.go@gmail.com>2021-10-15 04:10:18 +0300
committerDongjin Kim <tobetter@gmail.com>2021-12-11 12:24:03 +0300
commitfde5a2ba742b2adbff5ebbb4c3f0c6b88d7f8e3c (patch)
tree306e635d7ed144405d2590967b22b61ff403e5d4
parentfb6409dc1012f11d098ec260b6f284e4f69094a1 (diff)
downloadu-boot-fde5a2ba742b2adbff5ebbb4c3f0c6b88d7f8e3c.tar.xz
ODROID-COMMON: Changed the dtb load method.
- The rockchip load dtb file from resource image. but the odroid board load dtb file from the other methods like loading from dtb partition. - So Avoid rockchip's loading method. Before loading rockchip's resource image, check fdt header and avoid it. Change-Id: I2072b2a70939772c06e0319ccd07a21c89c73cce Signed-off-by: Luke Go <sangch.go@gmail.com>
-rw-r--r--arch/arm/mach-rockchip/resource_img.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/resource_img.c b/arch/arm/mach-rockchip/resource_img.c
index 1ae1503e8a..a0499f50c9 100644
--- a/arch/arm/mach-rockchip/resource_img.c
+++ b/arch/arm/mach-rockchip/resource_img.c
@@ -584,6 +584,9 @@ int resource_populate_dtb(void *img, void *fdt)
int format;
int ret;
+ if (!fdt_check_header(fdt))
+ return 0;
+
format = (genimg_get_format(img));
#ifdef CONFIG_ANDROID_BOOT_IMAGE
if (format == IMAGE_FORMAT_ANDROID) {