From patchwork Sun Mar 31 02:08:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 1071590 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X5a2mrfg"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44XChw32pRz9sQt for ; Sun, 31 Mar 2019 22:21:20 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 14ED3C21C27; Sun, 31 Mar 2019 11:19:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, KHOP_BIG_TO_CC, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 12833C21E2B; Sun, 31 Mar 2019 11:19:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9838CC21C2C; Sun, 31 Mar 2019 02:10:07 +0000 (UTC) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by lists.denx.de (Postfix) with ESMTPS id 503D0C21C27 for ; Sun, 31 Mar 2019 02:10:07 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id h18so7148627wml.1 for ; Sat, 30 Mar 2019 19:10:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WUgierElifp3thAukSaGTeI4TI0s3cZeLzDaDdlgid0=; b=X5a2mrfgsIwHfO4cJKz278oqddHDvHo8pq8vj1301WKW8C68/mNA8SIURbqlFQikGz wKtBxWoGOyVi2ht9Ms+/FK0di0VUK5VG5vIxg0X0Gbz+Jv/K93BvffP9UX9np6fGffKq vbtvIyM98tBwvfFh7up7tcL6b9vvKxLl28Q1YDCfZpCYePl3rGIfXMFhHWIjSai4gRT/ nFxJdfBycV+V5rt+e7MiocjwOf+UdFpSQa1wYE2b2/9qszj1nDdOB11MNgoOC9/w7jsJ kIfsfYNp7sO9Sz4y0TmsVOWzaSrcz4kF//JpnBcEvzpmDaooEZlNQ171EJHhhTsdI6XT iatA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WUgierElifp3thAukSaGTeI4TI0s3cZeLzDaDdlgid0=; b=Wr97jLr+cjQkHg6gCfHXbCFJuovldcIM8lRGnlMGNTVGWa3PGsIS0XwykcYhUmFf9e U1VctqlIXezqN7sFQDdbkF5UHgwEPynIgAUEuyVGWcl7Qcd/3lI/IP2bIwnuPvM2gPeY Zc4Or/Dl/HI/ze0PKJhDVQQT6SyczukC+2iGAw4zaPkFUpfb28U1i4yvg4jZOlN2x1rE DBOMGZTLcneObgBa1S/PGa292RsXyFAjruW9hAgKD/Y8G85/lCLZVBHUKTSIL7o2pL/+ Q0kf5A9hoJHfvMDzEV2+6ikY/M45TjUrwZ8l2Hg6iJkxjcROf20V0Vi+4sWjihZDFt2c Y3wQ== X-Gm-Message-State: APjAAAUzDEgTUuKYAwGMOCKJ2metLVTwaY3NFlzHTDLvdW9bu4nuWh+3 5O4KUA86sAysKK/AX1wof8Y= X-Google-Smtp-Source: APXvYqzamn3B646/i6Vf9kYBXDew5ozF1hr7ezkKfvIf42/7rfh1bVZ55TbYkdz/P64WRqBPwUwVBQ== X-Received: by 2002:a1c:a9d7:: with SMTP id s206mr8351809wme.126.1553998206882; Sat, 30 Mar 2019 19:10:06 -0700 (PDT) Received: from localhost.localdomain (ipb218f541.dynamic.kabel-deutschland.de. [178.24.245.65]) by smtp.gmail.com with ESMTPSA id e193sm10228733wmg.18.2019.03.30.19.10.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 30 Mar 2019 19:10:06 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Simon Glass , Tom Rini , Masahiro Yamada , Stefan Roese , Sam Protsenko , Simon Goldschmidt , Marek Vasut , George McCollister , Alexey Brodkin , Alexander Graf , York Sun , Tuomas Tynkkynen , Thomas Petazzoni , Shawn Guo , Paul Kocialkowski , Pantelis Antoniou , Michal Simek , Max Krummenacher , Marcel Ziswiler , Joe Hershberger , Joakim Tjernlund , Heiko Schocher , Hannes Schmelzer , Hannes Schmelzer , Daniel Schwierzeck , Bin Meng , u-boot@lists.denx.de Date: Sun, 31 Mar 2019 04:08:37 +0200 Message-Id: <20190331020838.26683-5-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190331020838.26683-1-erosca@de.adit-jv.com> References: <20190331020838.26683-1-erosca@de.adit-jv.com> MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 31 Mar 2019 11:19:00 +0000 Cc: Eugeniu Rosca , Eugeniu Rosca Subject: [U-Boot] [PATCH 5/6] fdt: boot_get_fdt: android: compress handling (non-functional) X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Prepare for booting Android images which lack any DTB in the second area using 'fdtaddr' environment variable as source/address of FDT. No functional/behavioral change expected in this patch. Signed-off-by: Eugeniu Rosca --- common/image-fdt.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/common/image-fdt.c b/common/image-fdt.c index 250f99aaaedd..8fea54335e99 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -457,14 +457,13 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch, struct andr_img_hdr *hdr = buf; ulong fdt_data; - if (android_image_get_second(hdr, &fdt_data, &fdt_len) != 0) - goto no_fdt; - - fdt_blob = (char *)fdt_data; - if (fdt_check_header(fdt_blob) != 0) + if (!android_image_get_second(hdr, &fdt_data, &fdt_len) && + !fdt_check_header((char *)fdt_data)) { + fdt_blob = (char *)fdt_data; + debug("## Using FDT in Android image second area\n"); + } else { goto no_fdt; - - debug("## Using FDT found in Android image second area\n"); + } #endif } else { debug("## No Flattened Device Tree\n");