From patchwork Fri Jan 8 10:33:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffy Chen X-Patchwork-Id: 7984101 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 90418BEEE5 for ; Fri, 8 Jan 2016 10:33:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2CF5201B9 for ; Fri, 8 Jan 2016 10:33:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 79E662012E for ; Fri, 8 Jan 2016 10:33:56 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aHUMm-0002xb-3N; Fri, 08 Jan 2016 10:33:56 +0000 Received: from regular1.263xmail.com ([211.150.99.137]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aHUMg-0002rv-Hg for linux-rockchip@lists.infradead.org; Fri, 08 Jan 2016 10:33:52 +0000 Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.11]) by regular1.263xmail.com (Postfix) with SMTP id BAE61B7B5; Fri, 8 Jan 2016 18:33:22 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 Received: from mae.263xmail.com (unknown [121.42.206.105]) by smtp.263.net (Postfix) with ESMTP id 5699F434; Fri, 8 Jan 2016 18:33:22 +0800 (CST) Received: from cjf?rock-chips.com (localhost [127.0.0.1]) by mae.263xmail.com (Postfix) with SMTP id 266961AB2A2; Fri, 8 Jan 2016 18:33:24 +0800 (CST) X-MAE-MAIL_UID: 00568f907401689f@maes@ef282d964f3253fd X-MAE-ID: 139.129.105.77 X-RL-SENDER: jeffy.chen@rock-chips.com X-LOGIN-NAME: jeffy.chen@rock-chips.com X-SENDER-IP: 58.22.7.114 X-SENDER: cjf@rock-chips.com From: Jeffy Chen To: u-boot@lists.denx.de Subject: [PATCH v2 1/6] common/image-fdt.c: Make boot_get_fdt() perform a check for Android images Date: Fri, 8 Jan 2016 18:33:27 +0800 Message-Id: <1452249212-25183-2-git-send-email-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452249212-25183-1-git-send-email-jeffy.chen@rock-chips.com> References: <1452249212-25183-1-git-send-email-jeffy.chen@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160108_023351_170130_90D7C8DC X-CRM114-Status: UNSURE ( 3.87 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Joe Hershberger , sjg@chromium.org, Jeffy Chen , Paul Kocialkowski , linux-rockchip@lists.infradead.org, Peng Fan , Max Krummenacher MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Android images don't have a fdt. Signed-off-by: Jeffy Chen Acked-by: Simon Glass --- 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;