From patchwork Fri Feb 26 04:16:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Art Nikpal X-Patchwork-Id: 1444934 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=bm2k8Tco; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dn9rw5Kwbz9s1l for ; Sat, 27 Feb 2021 00:45:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7D1BE827E4; Fri, 26 Feb 2021 14:45:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bm2k8Tco"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A0315801E9; Fri, 26 Feb 2021 05:16:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6611C80059 for ; Fri, 26 Feb 2021 05:16:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=email2tema@gmail.com Received: by mail-pl1-x62b.google.com with SMTP id b8so1803164plh.0 for ; Thu, 25 Feb 2021 20:16:29 -0800 (PST) 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=Ha70ZqXCyB1MNqxQvzXdIt3WpL0ZzPPSheOf17GvQXk=; b=bm2k8TcoG3vc1huqklSfIj8wIpQdef7k6hcOvOuf+aLB46JDy9Pj7HPlUifJps03Fb 6VwtbHHZQS5UHRL3V/J7mPTZkW6HHJA4dqvu0GC44y66S6W8Irey1/lRV4nJ7Lv18jDe 4OwJ9Wl6BM4d0GpnxcVp5rZhS4I7yPUQQpun71tTx14Kx81Hi/U5z/czwlQZhyGLKb7L XcNkSayH+dtFG5yoyNtw/PjuHg8oOKbOt2tXWc/EKp7aqk6IzyjGof8d3MxdSybg5ca+ uVBwSods7PGSOSKYrDEUXuTTH2Y5PPBWg9cwHVXzb3hY8OvZNEuLbD15XxfoJgGQwzWa cOuw== 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=Ha70ZqXCyB1MNqxQvzXdIt3WpL0ZzPPSheOf17GvQXk=; b=gX/J6QMQ/rfb4LVOJi6R9ysg7H+70hLN/OFTkAmFLM+LgKFQ1Lker5u2kwA0495ER0 v2BXsClPoW+XGywOWtEnk2qnr9/eNUwwf+//DSQ+5r5MgSjBhO5zA48Ezwp0QctsuxyJ e61ms7eL89mFOGl1lgtapTcRbviqb4UcJKQUVFZ/a0XyiWfkXhifakEFOLCi4OJ3eK21 yX3jPtUrprVKeXLydwzawbFidRTrP63i2RRj+A0Vd8xJNL6V7vlyeMAWFvFe9ij8pqbt gPjVDIkK8tqFrLiQZdRf/Z4UZHIru7ZgYcpZiwXYmFNfAM0pgb+6MwOHJhDEZRLucfKT Bdbg== X-Gm-Message-State: AOAM530As9McMD8U1r3wiYRIet2OYlOaseTWbgQ6LJIogTNeV8jDxjJW MXEqa8usytQ8PCon5D+hZYg= X-Google-Smtp-Source: ABdhPJzJrBMyBHXtfXfO+YgjJ4GplfEKK651TTntcNU5EuoLubkIR4JYRokuw7jH8ZR1Y09rA53RgA== X-Received: by 2002:a17:90b:368a:: with SMTP id mj10mr1370986pjb.210.1614312987499; Thu, 25 Feb 2021 20:16:27 -0800 (PST) Received: from localhost.localdomain (80.251.221.29.16clouds.com. [80.251.221.29]) by smtp.gmail.com with ESMTPSA id c15sm6859651pfj.170.2021.02.25.20.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Feb 2021 20:16:27 -0800 (PST) From: Artem Lapkin X-Google-Original-From: Artem Lapkin To: trini@konsulko.com Cc: =narmstrong@baylibre.com, khilman@baylibre.com, christianshewitt@gmail.com, u-boot@lists.denx.de, u-boot-amlogic@groups.io, art@khadas.com, nick@khadas.com, gouwa@khadas.com Subject: [PATCH] pxe_utils: improve dftoverlay path Date: Fri, 26 Feb 2021 12:16:08 +0800 Message-Id: <20210226041608.3019686-1-art@khadas.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 26 Feb 2021 14:45:07 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean I think be useful improve dftoverlay path logic, welcome for any suggestions. Fdtoverlaydir definition usage example LABEL linux ... FDTOVERLAYDIR fdt FDTOVERLAYS ethmac_disable.dtbo pcie_disable.dtbo vpu_disable.dtbo # same as # FDTOVERLAYS fdt/ethmac_disable.dtbo fdt/pcie_disable.dtbo fdt/vpu_disable.dtbo Usage without overlayfile extension (.dtbo) LABEL linux ... FDTOVERLAYS fdt/ethmac_disable fdt/pcie_disable fdt/vpu_disable # same as # FDTOVERLAYS fdt/ethmac_disable.dtbo fdt/pcie_disable.dtbo fdt/vpu_disable.dtbo Complex usage LABEL linux ... FDTOVERLAYDIR fdt FDTOVERLAYS ethmac_disable pcie_disable vpu_disable # same as # FDTOVERLAYS fdt/ethmac_disable.dtbo fdt/pcie_disable.dtbo fdt/vpu_disable.dtbo Signed-off-by: Artem Lapkin --- cmd/pxe_utils.c | 22 ++++++++++++++++++++-- cmd/pxe_utils.h | 1 + 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index 333f2073..a657fde6 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -289,6 +289,9 @@ static void label_destroy(struct pxe_label *label) if (label->fdtoverlays) free(label->fdtoverlays); + if (label->fdtoverlaydir) + free(label->fdtoverlaydir); + free(label); } @@ -352,6 +355,8 @@ static void label_boot_fdtoverlay(struct cmd_tbl *cmdtp, struct pxe_label *label ulong fdtoverlay_addr; ulong fdt_addr; int err; + char overlayext[] = ".dtbo"; + char path[MAX_TFTP_PATH_LEN + 1]; /* Get the main fdt and map it */ fdt_addr = simple_strtoul(env_get("fdt_addr_r"), NULL, 16); @@ -393,9 +398,15 @@ static void label_boot_fdtoverlay(struct cmd_tbl *cmdtp, struct pxe_label *label if (!strlen(overlayfile)) goto skip_overlay; + /* make overlay path */ + sprintf(path, "%s%s%s%s", + label->fdtoverlaydir ? label->fdtoverlaydir : "", + label->fdtoverlaydir ? "/" : "", + overlayfile, + strstr(fdtoverlay, overlayext) ? "" : overlayext); + /* Load overlay file */ - err = get_relfile_envaddr(cmdtp, overlayfile, - "fdtoverlay_addr_r"); + err = get_relfile_envaddr(cmdtp, path, "fdtoverlay_addr_r"); if (err < 0) { printf("Failed loading overlay %s\n", overlayfile); goto skip_overlay; @@ -693,6 +704,7 @@ enum token_type { T_FDT, T_FDTDIR, T_FDTOVERLAYS, + T_FDTOVERLAYDIR, T_ONTIMEOUT, T_IPAPPEND, T_BACKGROUND, @@ -730,6 +742,7 @@ static const struct token keywords[] = { {"devicetreedir", T_FDTDIR}, {"fdtdir", T_FDTDIR}, {"fdtoverlays", T_FDTOVERLAYS}, + {"fdtoverlaydir", T_FDTOVERLAYDIR}, {"ontimeout", T_ONTIMEOUT,}, {"ipappend", T_IPAPPEND,}, {"background", T_BACKGROUND,}, @@ -1168,6 +1181,11 @@ static int parse_label(char **c, struct pxe_menu *cfg) err = parse_sliteral(c, &label->fdtoverlays); break; + case T_FDTOVERLAYDIR: + if (!label->fdtoverlaydir) + err = parse_sliteral(c, &label->fdtoverlaydir); + break; + case T_LOCALBOOT: label->localboot = 1; err = parse_integer(c, &label->localboot_val); diff --git a/cmd/pxe_utils.h b/cmd/pxe_utils.h index d5475e84..cdac1327 100644 --- a/cmd/pxe_utils.h +++ b/cmd/pxe_utils.h @@ -44,6 +44,7 @@ struct pxe_label { char *fdt; char *fdtdir; char *fdtoverlays; + char *fdtoverlaydir; int ipappend; int attempted; int localboot;