From patchwork Fri Aug 23 14:40:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Leontiev X-Patchwork-Id: 1152700 X-Patchwork-Delegate: trini@ti.com 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="tjtbtFr8"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G3tH6pcTz9s7T for ; Sun, 25 Aug 2019 02:40:55 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 982E2C21E73; Sat, 24 Aug 2019 16:40:36 +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, RCVD_IN_MSPIKE_H2, 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 528B9C21D8A; Sat, 24 Aug 2019 16:40:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 61DCBC21C38; Fri, 23 Aug 2019 14:40:44 +0000 (UTC) Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by lists.denx.de (Postfix) with ESMTPS id 030C7C21C29 for ; Fri, 23 Aug 2019 14:40:44 +0000 (UTC) Received: by mail-lf1-f67.google.com with SMTP id x3so7314121lfn.6 for ; Fri, 23 Aug 2019 07:40:43 -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:mime-version :content-transfer-encoding; bh=XZf8kAiWP8YEneBe2tATEQKx2+NoFEWvSPLHtdfuzxY=; b=tjtbtFr8A77bBNWFQ5M0gIzTS6OIwC33eyN+iDnCIdUwj0R45FYshx4UzQ+9W+Hmmq B8T7Lm8DtRdge8WTcGD3FxfrJjSMUwRQZqPPJ5zRB4ym7+mrcVFDDfKPuaex3f4NtIf7 9fvG5n4Tql7MhaQr3FxDZKytLtAfqL95H+aOHQ9SRLE27QOU6KovXtAkyulajzVzRAN+ sDOWABro3a6s7lY5Qsf5u1RcNJBv8BDS/Qs9txku9wda+zM6YuJ0v5mopl3aBkUTc9NR RHirBm5Rcg8WjHz4d6YR8FB4aYBDHfaWJ+FIKHrpgztET+ZhwSzVlsH86HOGUDo3e2vb S25w== 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:mime-version :content-transfer-encoding; bh=XZf8kAiWP8YEneBe2tATEQKx2+NoFEWvSPLHtdfuzxY=; b=WiSAz/+merJU2YPfKYsOjShZBXNjAEVMYJZCMzBiNOE53bVIR+Df5v/4nz4AUc8MGI D+SG0i5kxrBpDeFTW7Q3yhQsRspY+x3uH112V7XQKK1fmOXDTDTlJUHRkPMpJzM4IQZw D679FMriNIxpF8gT0rO2XJv7gZDhgNbxdBLSpI6VhT9EvBEEcMhc+y7axBkwtBPwdelr KlWD+aRzhjXyRQPHoNecR6PFKEZTBG1IlBZJFoW1lNFaYWHhXLeQisvVJQl4X2NdOQRl o6TI2bj27r37Nf7e5a3Sdm7RqV2cZsXcBFuot6kzjbL+imZMmxgYkKi6tprZz8gVEv6m ujXg== X-Gm-Message-State: APjAAAUWewTQBvXQ4G1oK+MCBh7qqkcPkZi13KC4bsmGs9ZPqpjZ+SqM Q+XMHaNLKXmAEwypGlqtY8CfV0QRxhI= X-Google-Smtp-Source: APXvYqyFmTFVAH2DXlegw3nk3+Y6erXcCy+Fq47W0q9jAcoEfoORqKwCit9BiyKw9F/Iwb8kbESNwQ== X-Received: by 2002:ac2:46f8:: with SMTP id q24mr3110342lfo.89.1566571243338; Fri, 23 Aug 2019 07:40:43 -0700 (PDT) Received: from cetus-pc.elvees.com (horse.elvees.com. [80.90.126.253]) by smtp.gmail.com with ESMTPSA id f18sm685700ljj.60.2019.08.23.07.40.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Aug 2019 07:40:42 -0700 (PDT) From: Anton Leontiev To: u-boot@lists.denx.de Date: Fri, 23 Aug 2019 17:40:43 +0300 Message-Id: <20190823144043.26792-1-scileont@gmail.com> X-Mailer: git-send-email 2.22.1 MIME-Version: 1.0 X-Mailman-Approved-At: Sat, 24 Aug 2019 16:40:18 +0000 Cc: Anton Leontiev , Stephen Warren Subject: [U-Boot] [PATCH] cmd: pxe: Use internal FDT if external one cannot be retrieved 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" From: Anton Leontiev Original commit c61d94d86035 ("pxe: implement fdtdir extlinux.conf tag") states, that if FDT file cannot be retrieved then FDT packaged in firmware should be used. If FDT file cannot be retrieved and it is specified explicitly using FDT keyword then the label is skipped. If it cannot be found in FDTDIR then internal FDT is tried first. Signed-off-by: Anton Leontiev --- cmd/pxe.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/pxe.c b/cmd/pxe.c index 2059975446..28390c114c 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -795,9 +795,13 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) int err = get_relfile_envaddr(cmdtp, fdtfile, "fdt_addr_r"); free(fdtfilefree); if (err < 0) { - printf("Skipping %s for failure retrieving fdt\n", - label->name); - goto cleanup; + bootm_argv[3] = NULL; + + if (label->fdt) { + printf("Skipping %s for failure retrieving FDT\n", + label->name); + goto cleanup; + } } } else { bootm_argv[3] = NULL;