[v1,1/6] common/image-fdt.c: Make boot_get_fdt() perform a check for Android images
diff mbox

Message ID 1451893823-20309-2-git-send-email-jeffy.chen@rock-chips.com
State New
Headers show

Commit Message

JeffyChen Jan. 4, 2016, 7:50 a.m. UTC
Android images don't have a fdt.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---

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

Comments

Simon Glass Jan. 8, 2016, 3:33 a.m. UTC | #1
On 4 January 2016 at 00:50, Jeffy Chen <jeffy.chen@rock-chips.com> wrote:
> Android images don't have a fdt.
>
> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
> ---
>
>  common/image-fdt.c | 4 ++++
>  1 file changed, 4 insertions(+)

Acked-by: Simon Glass <sjg@chromium.org>

Patch
diff mbox

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;