From patchwork Fri Aug 26 13:15:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2310 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 847193F07C for ; Fri, 26 Aug 2022 15:15:46 +0200 (CEST) Received: by mail-wr1-f69.google.com with SMTP id t12-20020adfa2cc000000b00224f577fad1sf166332wra.4 for ; Fri, 26 Aug 2022 06:15:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1661519746; cv=pass; d=google.com; s=arc-20160816; b=kJJPXnh0oHEKsZuwCHZl8UpfGjfYKtnc497TtPScCCPXavp6M/la5L2pY96yn9lv1G 8p+NMyM9olsmtCFFi3daP3iig3JwA+Rt0aE/DPfzo3vj3goJtinlpaUe8IXoAAjRMc6q 0iiZmsuNJJSxLjxZEFwv/fkewcoPjFzuDHg7SyN3UBM7v8i4XYQ/bL0d1SHEuaLw0d78 m73Eiv8FXowSvCyaiZ3Vv0iOAV2RuWOnvCwczXAyp2IoGqQhbB4Wc7qm9dKIjhyDBbL+ iKCpcagOwrxoIGSDivo7S1VMGxxqsFAmqIAm9W2mGtl/GTolKO4uY4F+pMtq0+8CrioX iQzA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=SJ7GIbiVALNJa16BsgrCnvovDPeRw35P/aFmO3G6DJA=; b=PNgpmRvIN0a7hTvciHToWACxgYNBvC6CX5bi5DekBLm9yEjGrSTeZ3loE/lrA9VKYE v2HycW5EZAfueVG3u0Ph+4L41ytlh/aLOSwR6Pf1asZbjvjX9pkoTqyH3M/CF54oaVWH rPerN5M1yBFzLzgyhFOCtjmcrvZ5Gn1NrEnqI91psrFFnmAwM6HngGzCPNa/uZNgKkxK 26iejbct9dc/87OFMtiANfkz3orLyrXRvftJXAbd5MXJXVMCc9iTOw6DEiu2NuTorDml aAfHDMvm/68sZF+75yz/5Gh6bupcRFJM/ZAfNNUBuUHAfasJsofrsShSQTCrl4VUAozs NmuQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=W9VHPK4e; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc; bh=SJ7GIbiVALNJa16BsgrCnvovDPeRw35P/aFmO3G6DJA=; b=W8oBv6x1AxkvxgwxXByDoXKaT1d0DLJO/t3WXfwxN50tEoOTFzHS01FH8TGAbCvik3 JqtuVpTffn2ta1zXhceTp9ytnPl7CAZZ4IpgIeLKMbjU8YtNXne4ZoW77Yf+uqjXVQFr WF0Nl8ccHV7n/3rJkVttf8eHEBESylRHLOzlk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=SJ7GIbiVALNJa16BsgrCnvovDPeRw35P/aFmO3G6DJA=; b=2P4pzRW8SFlBA6IzkytnqZLDdhcv1JW8y7Z7M+Z1raM7g9AAQ3IiwK9Pf19Qo8XSvn B6oI8IeecreIGFwLjwxm5Df4dEZgWu1tnYnBbySTK4lJ9uTs2FZjtBeAuvK8SycWC/GA lzxGv1ugv+AF99Wb5FnEuoCfsOm+yJRB1NWI0kZcXqYJ2sNoniIukDdlWVrOD+bxw4fb nV/zq4U4/oV3WV59yXIahkXRQcyXE9dLAUG6PXkfl62WfvGi2f8jIssrJOahW9GJclU5 2iQwv/HGhoheeFus5ZrYxqRs0dl1KPBkeA9XUykbUvMa01PkIWdcU902sw7Cj8PjjE7b 7V/A== X-Gm-Message-State: ACgBeo3IWkbDvYxafzVAljgO+FOJACUkOS8jlVfVF7h3t/p3Wz7BE56A KdYsQfaUIjvEWE/1rrbcgkCjUW9N X-Google-Smtp-Source: AA6agR6FK7tMuckAnYx+c80LjnqHZNQ/gB2+yoX67QAjfQf+0oCN+SA0cWseR8CHUQhznnGq8XIFJQ== X-Received: by 2002:a05:600c:35d4:b0:3a6:18ba:1585 with SMTP id r20-20020a05600c35d400b003a618ba1585mr11556596wmq.48.1661519746137; Fri, 26 Aug 2022 06:15:46 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6000:22d:b0:221:24a2:5cf with SMTP id l13-20020a056000022d00b0022124a205cfls6540832wrz.0.-pod-prod-gmail; Fri, 26 Aug 2022 06:15:45 -0700 (PDT) X-Received: by 2002:a5d:618b:0:b0:225:8625:a2d1 with SMTP id j11-20020a5d618b000000b002258625a2d1mr3166544wru.24.1661519744939; Fri, 26 Aug 2022 06:15:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661519744; cv=none; d=google.com; s=arc-20160816; b=Z1hGZWt+RPis5tw17beV/PqaX6G6Au5pzETTZg8YtxsMojW2qkXDwNxZ8qi4TX78bZ JBL57ut3G72itZds3CwPl9SXXbSBl4azF+wiTb9oae0524+HNGVthjYjmVG6deZNu1qA v6YUM7BiAC1TgOvXUS8d9FI9lyT3Jumjf/9JXQzUEaMCY3dJohbmr7/SjR9PQy6IvUoq EGubc3oCgegIkGeoaxer40mUaKBy9nFY97AKzy+qgq+RRm002sdInI/XMwDcLwT1dZ84 CCbmfRopVktBkG3oHZiVcJCJx2/lIvFt4PSYwthRsLyJHZN5yRmN6L45onm/ZDT+A0Z+ pPKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=EM6nS8IoZJAudxegLUwBDVBh7pKHrLcDZLO+5UffRFc=; b=izGpz8Kf5akNRGjYJUej+nNGzMCQh+yfbgwuAbs72M+hNsLlIVg9DCbLqvN6tnpzo1 Iy4qU9KNzyxU7PQpOED8d75ceHnAdjp0VOW684NbfdE6JX548aDN3hsEoQqUeDI74Nkf Rr55pcPxXmhjbCnh+BdpbEBv/tY2Oe5fBm8nKw9pYlGgKae9Z4CgnpLUWVTiczRl7IpN SX4YWF7el2vW4oy17Jdy2eYaKAsDSJGdJbVZibGyh7aBHq0SpympoTtcAXGDd5fgiUn4 Sq+xeotOZ3bsILchD5DqTVcXL62BpIYFeCEZMRKN4zLafjrk3PuSXHuGZKYH9FVnkY3N tEYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=W9VHPK4e; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id c130-20020a1c3588000000b003a616ef9d3bsor1973925wma.40.2022.08.26.06.15.44 for (Google Transport Security); Fri, 26 Aug 2022 06:15:44 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a05:6402:4504:b0:43b:4ec7:2ec1 with SMTP id ez4-20020a056402450400b0043b4ec72ec1mr6625968edb.7.1661519744465; Fri, 26 Aug 2022 06:15:44 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-31-31-9.retail.telecomitalia.it. [79.31.31.9]) by smtp.gmail.com with ESMTPSA id w23-20020aa7cb57000000b0043a61f6c389sm101249edt.4.2022.08.26.06.15.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Aug 2022 06:15:43 -0700 (PDT) From: Dario Binacchi To: u-boot@lists.denx.de Cc: Amarula patchwork , Dario Binacchi , Simon Glass Subject: [RFC PATCH] Rename disto_[pxe_]getfile to distro_[pxe_]getfile Date: Fri, 26 Aug 2022 15:15:41 +0200 Message-Id: <20220826131541.586827-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=W9VHPK4e; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Replace 'disto' with 'distro' since they are all functions about distro booting. Signed-off-by: Dario Binacchi Reviewed-by: Simon Glass --- boot/bootmeth_distro.c | 6 +++--- boot/bootmeth_pxe.c | 6 +++--- doc/develop/bootstd.rst | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/boot/bootmeth_distro.c b/boot/bootmeth_distro.c index fea09b2c2fbe..5c6c687f0a64 100644 --- a/boot/bootmeth_distro.c +++ b/boot/bootmeth_distro.c @@ -35,8 +35,8 @@ static int distro_get_state_desc(struct udevice *dev, char *buf, int maxsize) return 0; } -static int disto_getfile(struct pxe_context *ctx, const char *file_path, - char *file_addr, ulong *sizep) +static int distro_getfile(struct pxe_context *ctx, const char *file_path, + char *file_addr, ulong *sizep) { struct distro_info *info = ctx->userdata; ulong addr; @@ -113,7 +113,7 @@ static int distro_boot(struct udevice *dev, struct bootflow *bflow) addr = map_to_sysmem(bflow->buf); info.dev = dev; info.bflow = bflow; - ret = pxe_setup_ctx(&ctx, &cmdtp, disto_getfile, &info, true, + ret = pxe_setup_ctx(&ctx, &cmdtp, distro_getfile, &info, true, bflow->subdir); if (ret) return log_msg_ret("ctx", -EINVAL); diff --git a/boot/bootmeth_pxe.c b/boot/bootmeth_pxe.c index f1e2b4c77627..e6992168c067 100644 --- a/boot/bootmeth_pxe.c +++ b/boot/bootmeth_pxe.c @@ -23,8 +23,8 @@ #include #include -static int disto_pxe_getfile(struct pxe_context *ctx, const char *file_path, - char *file_addr, ulong *sizep) +static int distro_pxe_getfile(struct pxe_context *ctx, const char *file_path, + char *file_addr, ulong *sizep) { struct distro_info *info = ctx->userdata; ulong addr; @@ -142,7 +142,7 @@ static int distro_pxe_boot(struct udevice *dev, struct bootflow *bflow) info.dev = dev; info.bflow = bflow; info.cmdtp = &cmdtp; - ret = pxe_setup_ctx(ctx, &cmdtp, disto_pxe_getfile, &info, false, + ret = pxe_setup_ctx(ctx, &cmdtp, distro_pxe_getfile, &info, false, bflow->subdir); if (ret) return log_msg_ret("ctx", -EINVAL); diff --git a/doc/develop/bootstd.rst b/doc/develop/bootstd.rst index f7fc72570766..1ccc49424ebd 100644 --- a/doc/develop/bootstd.rst +++ b/doc/develop/bootstd.rst @@ -322,7 +322,7 @@ look like this:: The `sf-bootdev` driver can implement a way to read from the SPI flash, using the offset and size provided, and return that bootflow file back to the caller. -When distro boot wants to read the kernel it calls disto_getfile() which must +When distro boot wants to read the kernel it calls distro_getfile() which must provide a way to read from the SPI flash. See `distro_boot()` at distro_boot_ for more details.