[U-Boot] [PATCH v4 1/6] common/image-fdt.c: Make boot_get_fdt() perform a check for Android images

Jeffy Chen
2016-01-13T08:53:15Z

Android images don't have a fdt.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>
---

Changes in v4: None
Changes in v3: None
Changes in v2: None

common/image-fdt.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/common/image-fdt.c b/common/image-fdt.c
index 5e4e5bd..41aaa0d 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -379,6 +379,10 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
(long)fdt_addr);
}
break;
+#ifdef CONFIG_ANDROID_BOOT_IMAGE
+ case IMAGE_FORMAT_ANDROID:
+ goto no_fdt;
+#endif
default:
puts("ERROR: Did not find a cmdline Flattened Device Tree\n");
goto no_fdt;
--
2.1.4