From patchwork Wed Sep 11 09:58:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827373 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp710143wrc; Wed, 11 Sep 2024 02:59:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWwt9wK9AECmzG6md+82uIhQvn3xB11bp4Yem/LRS0JJpNrsPYl6gzzeBQ0p/9fQubdf6jMjg==@linaro.org X-Google-Smtp-Source: AGHT+IF4oxCFCfFdH4+xFt8ttUY4tpz9GcXO4cndFsH8Veuue2ABDW1xgvJtFeWBOj7MMGCe2lmR X-Received: by 2002:adf:eb8b:0:b0:371:88b9:256d with SMTP id ffacd0b85a97d-378b07966f2mr1557899f8f.6.1726048742880; Wed, 11 Sep 2024 02:59:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048742; cv=none; d=google.com; s=arc-20240605; b=AfIfoHfJ2WdIIhFHr7LifRlnrd+1tG2r9xQcMeKHhRBCu+XdbQEhPiwtrwkVuuQEqc XAS3HIFiIoXoiMAyMjVU5cUy8ND3U3KwlUzQcFjoK0Nc5lyJ/9wweHniNf3/L4Kx7oTV LpBa2v/zxBRrtUzk+qUI6eTlUBL0wobxqZa0m9WiFkHlVgeV/+gu3mzHD0YwLHLwXLQV 5kvnFVn7huhHh9xR/cPK5oRLoLVFeaWLnxzckHPaBSE2+cIgP9PyN6yIOp3KT4mzuDxI AzeUWxhHU4g79V3ltx1ajjK3Z2bc1vRn25HF6HMcf1d/Goo4vWEqVANZIEBJQ9T164Ev q4XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=teYIAqjwDVz3xpHp99O/xsLua/5vGoVOcC/xnmwefdU=; fh=JxlJYrd3Lwc7oqYIiOxk876BpEKmxBqK1lYK4ccg0uQ=; b=SjiquyBGDcxle1IojAnhkm05Bd52ZaVzd8cQLEnSBlF9a5h42b0AQE3u9E1/JGWiTO 07WJKhmS3fsnEIlrbBtqYVSRiSo7yC9NC6rdVkL02vASf/OLltIxD8tX2r8IuTcg7l/Z WyaswTxYcId5HFYnHAFPMy3iA7ZcnVABkzlyd+kYqGsdPQO2l5/BuEF3PAQYH4mGeuLJ XlIlOpCdQGVB3RQfUhfH+75xRQ1ACQaZA4TG/7eU+pcH9xK77W88ki4nC/DMwkRF/ypF A4WU9lCMXscaGeAVYeXX9gXVmT9dPWKE5eH3QATcHAh/LLgKargW+EGAEPc+01+zHolt lR6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jhVxBhXE; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id ffacd0b85a97d-378956d8d95si3872187f8f.1050.2024.09.11.02.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:59:02 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jhVxBhXE; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D5F7389241; Wed, 11 Sep 2024 11:58:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="jhVxBhXE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 871038915D; Wed, 11 Sep 2024 11:58:50 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) (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 8A311891ED for ; Wed, 11 Sep 2024 11:58:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-42cb9a0c300so16249235e9.0 for ; Wed, 11 Sep 2024 02:58:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048728; x=1726653528; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=teYIAqjwDVz3xpHp99O/xsLua/5vGoVOcC/xnmwefdU=; b=jhVxBhXE+rXXcbQDVeNrrWG03Y+ZdzrMMq/SwJnvqoNrHy/XSvaN5IqhrMH45FqMIW Z2q43fMHhC8fZiaHYoqlHnb7xd9o4FbONQ8LD7wSg1s+YS2ReAp5u0qxoU1DkdYfpQ+3 gN000F1J0pBJpibGGkbWb1s+nqsx7kG/mYD77zsoBsUPwcvO6oo02UKYe7Ew/w1PPocW +LBSdHuhABPd4hUAPplcLPCYfBuzmfTLc0lJvTx6I9jIIKfLOJ77FUHzbZ/abZn5lPgF j4LNFt8lIQP3T4ivOSq04amn2AfN0quxdDUWjyh+SaSUFxwTorODIYUnpyVGUiy7LRe0 CWEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048728; x=1726653528; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=teYIAqjwDVz3xpHp99O/xsLua/5vGoVOcC/xnmwefdU=; b=nKDchZjb/Qu2ru2Dxtw6lLOfJjkJGef/2tT0pzkAfLduMVmTY1txr1VAMMxqCMibI1 +69LlssDcCPXpJRmmtaw76ywI3t1ZjKfsSychUsy2Tb8IYy3LzWcqnQURZ7c/nLfU2xr s73KBpbXhmQDcIbiHKjeBnKxSyYWTH4DQlysqHZ+KqScHizsewgZeAaWZZHZfSK9zKUW ii+ris8o+E2pU9ul27qKtCIn3Vqi0NfdgyPjR18SFKGr7psUmQbaJHP4PsN+FU+aAwMu G4p0J8UrKr2JRhF5IJehNT1j/H2dP1qSlU0HyPcmVp8zBcw+PJNRfWqTZr51FIeh5rEa 59Iw== X-Gm-Message-State: AOJu0Yww8viFVCfnu+7rhf1B34QKuEws/R/i/csvqCKoeHwUgeVrcOjk kQRlW/GUNMAsmf+odyXkD/5tXQV2/v2F/i5acu3yKAs/jnb11lD7uxYeMKNpnuTE8KshA3AE83O G+wJo3Q== X-Received: by 2002:a05:600c:5493:b0:42c:bf0b:c489 with SMTP id 5b1f17b1804b1-42ccd32eb20mr21251095e9.18.1726048727480; Wed, 11 Sep 2024 02:58:47 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:47 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Simon Glass , Tom Rini , Heinrich Schuchardt , Brandon Maier , Andrejs Cainikovs Subject: [PATCH v4 01/15] buildman/toolchain.py: do not set CROSS_COMPILE for sandbox Date: Wed, 11 Sep 2024 11:58:14 +0200 Message-Id: <721993374cd63a2cddced7aff045fd0f23d9ecca.1726048404.git.jerome.forissier@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean When building for sandbox, self.cross is empty. In MakeEnvironment(), CROSS_COMPILE is defined to be self.cross (with or without a full path), optionally prefixed by the toolchain wrapper defined in ~/.buildman. This is fine when self.cross is not empty, but it doesn't make sense when it is: - Either there is no wrapper and we end up with an empty CROSS_COMPILE which is the same as not defining it (the host compiler will be used), - Or there is a wrapper and CROSS_COMPILE will contain only the wrapper which obviously is not a valid compiler, hence an error. Test case: $ sudo apt install ccache $ grep -q toolchain-wrapper ~/.buildman || \ printf "[toolchain-wrapper]\nwrapper = ccache\n" >>~/.buildman $ make mrproper $ ./tools/buildman/buildman sandbox_noinst $ ./tools/buildman/buildman sandbox_noinst Building current source for 1 boards (1 thread, 24 jobs per thread) sandbox: + sandbox_noinst +arch/sandbox/lib/reloc_sandbox_efi.c:10:15: error: operator '==' has no left operand + 10 | #if HOST_ARCH == HOST_ARCH_X86_64 + | ^~ [...] The GetEnvArgs function is modified too, since the VAR_CROSS_COMPILE case has the same issue. In tools/buildman/test.py, testGetEnvArgs is extended and testMakeEnvironment is added. They check the 'arm' and 'sandbox' toolchains, with and without a wrapper. Signed-off-by: Jerome Forissier Reviewed-by: Simon Glass --- tools/buildman/test.py | 46 +++++++++++++++++++++++++++++++++++++ tools/buildman/toolchain.py | 6 +++-- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/tools/buildman/test.py b/tools/buildman/test.py index 5eed013d51c..46aa2a17916 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -36,6 +36,16 @@ main: /usr/sbin x86: i386 x86_64 ''' +settings_data_wrapper = ''' +# Buildman settings file + +[toolchain] +main: /usr/sbin + +[toolchain-wrapper] +wrapper = ccache +''' + migration = '''===================== WARNING ====================== This board does not use CONFIG_DM. CONFIG_DM will be compulsory starting with the v2020.01 release. @@ -606,6 +616,9 @@ class TestBuild(unittest.TestCase): tc.GetEnvArgs(toolchain.VAR_ARCH)) self.assertEqual('', tc.GetEnvArgs(toolchain.VAR_MAKE_ARGS)) + tc = self.toolchains.Select('sandbox') + self.assertEqual('', tc.GetEnvArgs(toolchain.VAR_CROSS_COMPILE)) + self.toolchains.Add('/path/to/x86_64-linux-gcc', test=False) tc = self.toolchains.Select('x86') self.assertEqual('/path/to', @@ -614,6 +627,39 @@ class TestBuild(unittest.TestCase): self.assertEqual('HOSTCC=clang CC=clang', tc.GetEnvArgs(toolchain.VAR_MAKE_ARGS)) + # Test config with ccache wrapper + bsettings.setup(None) + bsettings.add_file(settings_data_wrapper) + + tc = self.toolchains.Select('arm') + self.assertEqual('ccache arm-linux-', + tc.GetEnvArgs(toolchain.VAR_CROSS_COMPILE)) + + tc = self.toolchains.Select('sandbox') + self.assertEqual('', tc.GetEnvArgs(toolchain.VAR_CROSS_COMPILE)) + + def testMakeEnvironment(self): + """Test the MakeEnvironment function""" + tc = self.toolchains.Select('arm') + env = tc.MakeEnvironment(False) + self.assertEqual(env[b'CROSS_COMPILE'], b'arm-linux-') + + tc = self.toolchains.Select('sandbox') + env = tc.MakeEnvironment(False) + self.assertTrue(b'CROSS_COMPILE' not in env) + + # Test config with ccache wrapper + bsettings.setup(None) + bsettings.add_file(settings_data_wrapper) + + tc = self.toolchains.Select('arm') + env = tc.MakeEnvironment(False) + self.assertEqual(env[b'CROSS_COMPILE'], b'ccache arm-linux-') + + tc = self.toolchains.Select('sandbox') + env = tc.MakeEnvironment(False) + self.assertTrue(b'CROSS_COMPILE' not in env) + def testPrepareOutputSpace(self): def _Touch(fname): tools.write_file(os.path.join(base_dir, fname), b'') diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 6ca79c2c0f9..a7d7883b851 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -159,6 +159,8 @@ class Toolchain: if which == VAR_CROSS_COMPILE: wrapper = self.GetWrapper() base = '' if self.arch == 'sandbox' else self.path + if (base == '' and self.cross == ''): + return '' return wrapper + os.path.join(base, self.cross) elif which == VAR_PATH: return self.path @@ -208,10 +210,10 @@ class Toolchain: if self.override_toolchain: # We'll use MakeArgs() to provide this pass - elif full_path: + elif full_path and self.cross: env[b'CROSS_COMPILE'] = tools.to_bytes( wrapper + os.path.join(self.path, self.cross)) - else: + elif self.cross: env[b'CROSS_COMPILE'] = tools.to_bytes(wrapper + self.cross) # Detect a Python virtualenv and avoid defeating it From patchwork Wed Sep 11 09:58:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827374 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp710187wrc; Wed, 11 Sep 2024 02:59:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWKjwX8odiAA8WZMnsejjxAwEiboh0gNc7lDwIFdo1FBpl/r5ajyxwzVE5YMShb+PiVO34Teg==@linaro.org X-Google-Smtp-Source: AGHT+IH0RDoLmxK5gLltFtbuZX+QFSEH8SdoBgxiox/nZCCp5VrYzS84rHrTiXyx0S3Kx+Mq33OT X-Received: by 2002:a05:600c:1987:b0:428:10d7:a4b1 with SMTP id 5b1f17b1804b1-42ccd35b222mr22093645e9.25.1726048754666; Wed, 11 Sep 2024 02:59:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048754; cv=none; d=google.com; s=arc-20240605; b=T0hMBXbDBollL3Lnip26MGii7Yvc99ZWr5rcx0dhywAQn8BjYE9O3sZm+uPkYIP2SF f78fkl35XratSzfJqGzFhCTDEV3e3lEWhWubR4VaK8LsXCJW9q/VY40D59dqH7D9g8es rCV5gjC8kXywp9PgqpnDLSBkBos6r3PYdKDavRkMlaUCUQ//pEWXH5CbE/e5uvVBAFB8 FJRTjg9Rdbhc3jwnACnDH2RETgihbsjxghOfaLJ5usnM4YRSLp2ddX3ru1eZAPH2/Xvt jWIGKRtTm4kasaFE9wSIpW7q4YKb0vl9/VZ74LQy+jAYps8ujiN/Z3uv8Q++28jJSHt7 ZfQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Jzb/mRtjzSkwQDUPWBuVjzDQMQ57CVrfodOKkaFVbTU=; fh=slYz+UywTUfWLwNOPkfX9QDtFYdM/Qn6XR9LiPzRPRg=; b=XdMgK69qd2isqYsHbUq1e4gp8yT3Xt7tu75snW4Jrz+ZzTzmfdsMP2nwdI5+xy7EEd LEf8Xy7bsmwgvbEAOTWrB6+v/4Id9+CmzbFWGXBwhdGP4uln9/2rarsU9HTjlPOkMvaz GLAfI9nGDy97xt79GCCkV4RaGF/TyA5W74AakTolgJ5dOjTKMLIEY/eoIbEnMplDoiKC Q3zykc2Iz4eAbS5NJg7tLCj6waYehlYztvGaCicbI3jKfJIsW12ZO45hnTmWVYnkKDr5 xqaCgvvoAEpJQ79VBaA3fMOhvuufonufZZRhAJ8tZ5iG0VHKNyygqfjdUuq3aGswPGqP 208g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rRI1jRK3; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id 5b1f17b1804b1-42caebb04d2si46135945e9.161.2024.09.11.02.59.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:59:13 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rRI1jRK3; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5A73D89242; Wed, 11 Sep 2024 11:58:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="rRI1jRK3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1DE108923A; Wed, 11 Sep 2024 11:58:52 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) (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 A14588923B for ; Wed, 11 Sep 2024 11:58:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-374c1120a32so1257795f8f.1 for ; Wed, 11 Sep 2024 02:58:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048729; x=1726653529; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Jzb/mRtjzSkwQDUPWBuVjzDQMQ57CVrfodOKkaFVbTU=; b=rRI1jRK3cui9Nibo5qid5sIL68clx1FdObyEdY+0hte48XtTqZokL0nqNSaawZFuOW Uxoq0za3RsYNAc4y6xAQS3MaKv+CejI4BJ2eIjQOkbtjqPsywHhGyjQkgazckp5Mbtrj qNDT+8lRAIZblK3Boq5UqQiVfHceHH55nr8CtbtLe/GIzQ2pufsYtS0dmXL5rV4k+oih Hv8N+DWtNNZfFN5AKfvtVPBBXItPoIyoB6QiM76XobAAHVKhB0HG5zkk3TECnR1HfSeK XkD2ydSlRFihGBfDIUQFhh2cBk+NFnjHvDHLLXkCdU2aNK395sXCIdRo0aDYjFVrlS3H 9OOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048729; x=1726653529; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Jzb/mRtjzSkwQDUPWBuVjzDQMQ57CVrfodOKkaFVbTU=; b=NxRFTOG5OvjvaXBsv9XO5BC/0qbUNA9m9XcjXqntNDsdyYyQgA57DgCSYuHwqox/yf 4XjjtrJQWxZ2Xj5uLqhQAANpPEb2etFFs8EoLj4RbOI+j+uJH5O9Z3JrkzkXrBVTo8aT Ie4wwtu8abvGZQHgbR8R5YioLQTvlSV92MqKoInY0CYPZnvDoDgJVmKD2aO2oBb+05g3 WO1I6VTfCNMOgYXkFkujYn1LKpV63wUx097ndsqi0i8GW2d8+zhUQoO3l5ttaDGmGrdh tsPVAVcBZTC9zPPyh2fhhPGL79UEhqe6VLXUzd0R6ava9JajfC8VMC5miyRv+JO5oTiC oXpA== X-Gm-Message-State: AOJu0YyBp1uu3ZTZUu78eQbyOMUN/iHtih1O0lgySAnU6p3DqYWY/DP0 l7gN3b9Q54LdUHFNaAZJ7ZD99ZzdPicRKqSteOIcBksl685d8AOxsTJ8YiwzjyNuWjbKJ89aM0p o9rGmrw== X-Received: by 2002:adf:ee4d:0:b0:371:8c75:a085 with SMTP id ffacd0b85a97d-378b080e4c5mr1647293f8f.58.1726048728770; Wed, 11 Sep 2024 02:58:48 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:48 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Angelo Dureghello , TsiChung Liew , Stefan Roese , Marek Vasut , Jason Liu , Peng Fan , William Zhang Subject: [PATCH v4 02/15] flash: prefix error codes with FL_ Date: Wed, 11 Sep 2024 11:58:15 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean Prefix the flash status codes (ERR_*) with FL_ in order to avoid clashes with third-party libraries. Case in point: including the lwIP library header file which defines err_enum_t as an enum with values being ERR_*. Signed-off-by: Jerome Forissier Reviewed-by: Tom Rini Reviewed-by: Ilias Apalodimas Reviewed-by: Peter Robinson --- board/cobra5272/flash.c | 26 +++++++++--------- board/freescale/m5253demo/flash.c | 6 ++--- common/flash.c | 44 +++++++++++++++---------------- drivers/mtd/altera_qspi.c | 4 +-- drivers/mtd/cfi_flash.c | 36 ++++++++++++------------- include/flash.h | 20 +++++++------- 6 files changed, 68 insertions(+), 68 deletions(-) diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index 616842e62f4..d324aa6ac11 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -135,22 +135,22 @@ int flash_erase(flash_info_t *info, int s_first, int s_last) { ulong result; int iflag, cflag, prot, sect; - int rc = ERR_OK; + int rc = FL_ERR_OK; int chip1; ulong start; /* first look for protection bits */ if (info->flash_id == FLASH_UNKNOWN) - return ERR_UNKNOWN_FLASH_TYPE; + return FL_ERR_UNKNOWN_FLASH_TYPE; if ((s_first < 0) || (s_first > s_last)) { - return ERR_INVAL; + return FL_ERR_INVAL; } if ((info->flash_id & FLASH_VENDMASK) != (AMD_MANUFACT & FLASH_VENDMASK)) { - return ERR_UNKNOWN_FLASH_VENDOR; + return FL_ERR_UNKNOWN_FLASH_VENDOR; } prot = 0; @@ -160,7 +160,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last) } } if (prot) - return ERR_PROTECTED; + return FL_ERR_PROTECTED; /* * Disable interrupts which might cause a timeout @@ -217,11 +217,11 @@ int flash_erase(flash_info_t *info, int s_first, int s_last) MEM_FLASH_ADDR1 = CMD_READ_ARRAY; if (chip1 == ERR) { - rc = ERR_PROG_ERROR; + rc = FL_ERR_PROG_ERROR; goto outahere; } if (chip1 == TMO) { - rc = ERR_TIMEOUT; + rc = FL_ERR_TIMEOUT; goto outahere; } @@ -252,7 +252,7 @@ static int write_word(flash_info_t *info, ulong dest, ulong data) { volatile u16 *addr = (volatile u16 *) dest; ulong result; - int rc = ERR_OK; + int rc = FL_ERR_OK; int cflag, iflag; int chip1; ulong start; @@ -262,7 +262,7 @@ static int write_word(flash_info_t *info, ulong dest, ulong data) */ result = *addr; if ((result & data) != data) - return ERR_NOT_ERASED; + return FL_ERR_NOT_ERASED; /* * Disable interrupts which might cause a timeout @@ -302,7 +302,7 @@ static int write_word(flash_info_t *info, ulong dest, ulong data) *addr = CMD_READ_ARRAY; if (chip1 == ERR || *addr != data) - rc = ERR_PROG_ERROR; + rc = FL_ERR_PROG_ERROR; if (iflag) enable_interrupts(); @@ -320,13 +320,13 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) if (addr & 1) { printf ("unaligned destination not supported\n"); - return ERR_ALIGN; + return FL_ERR_ALIGN; } #if 0 if (cnt & 1) { printf ("odd transfer sizes not supported\n"); - return ERR_ALIGN; + return FL_ERR_ALIGN; } #endif @@ -364,5 +364,5 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) cnt -= 1; } - return ERR_OK; + return FL_ERR_OK; } diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c index 334518a4bc9..ab5d2ebff64 100644 --- a/board/freescale/m5253demo/flash.c +++ b/board/freescale/m5253demo/flash.c @@ -72,7 +72,7 @@ int flash_get_offsets(ulong base, flash_info_t * info) } } - return ERR_OK; + return FL_ERR_OK; } void flash_print_info(flash_info_t * info) @@ -369,9 +369,9 @@ int write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt) } if (cnt == 0) - return ERR_OK; + return FL_ERR_OK; - return ERR_OK; + return FL_ERR_OK; } /*----------------------------------------------------------------------- diff --git a/common/flash.c b/common/flash.c index 24ddc8bee72..a64e51a9b5a 100644 --- a/common/flash.c +++ b/common/flash.c @@ -110,13 +110,13 @@ addr2info(ulong addr) * Make sure all target addresses are within Flash bounds, * and no protected sectors are hit. * Returns: - * ERR_OK 0 - OK - * ERR_TIMEOUT 1 - write timeout - * ERR_NOT_ERASED 2 - Flash not erased - * ERR_PROTECTED 4 - target range includes protected sectors - * ERR_INVAL 8 - target address not in Flash memory - * ERR_ALIGN 16 - target address not aligned on boundary - * (only some targets require alignment) + * FL_ERR_OK 0 - OK + * FL_ERR_TIMEOUT 1 - write timeout + * FL_ERR_NOT_ERASED 2 - Flash not erased + * FL_ERR_PROTECTED 4 - target range includes protected sectors + * FL_ERR_INVAL 8 - target address not in Flash memory + * FL_ERR_ALIGN 16 - target address not aligned on boundary + * (only some targets require alignment) */ int flash_write(char *src, ulong addr, ulong cnt) @@ -131,11 +131,11 @@ flash_write(char *src, ulong addr, ulong cnt) __maybe_unused ulong cnt_orig = cnt; if (cnt == 0) { - return (ERR_OK); + return (FL_ERR_OK); } if (!info_first || !info_last) { - return (ERR_INVAL); + return (FL_ERR_INVAL); } for (info = info_first; info <= info_last; ++info) { @@ -146,7 +146,7 @@ flash_write(char *src, ulong addr, ulong cnt) if ((end >= info->start[i]) && (addr < e_addr) && (info->protect[i] != 0) ) { - return (ERR_PROTECTED); + return (FL_ERR_PROTECTED); } } } @@ -169,11 +169,11 @@ flash_write(char *src, ulong addr, ulong cnt) #if defined(CONFIG_FLASH_VERIFY) if (memcmp(src_orig, addr_orig, cnt_orig)) { printf("\nVerify failed!\n"); - return ERR_PROG_ERROR; + return FL_ERR_PROG_ERROR; } #endif /* CONFIG_SYS_FLASH_VERIFY_AFTER_WRITE */ - return (ERR_OK); + return (FL_ERR_OK); } /*----------------------------------------------------------------------- @@ -182,33 +182,33 @@ flash_write(char *src, ulong addr, ulong cnt) void flash_perror(int err) { switch (err) { - case ERR_OK: + case FL_ERR_OK: break; - case ERR_TIMEOUT: + case FL_ERR_TIMEOUT: puts ("Timeout writing to Flash\n"); break; - case ERR_NOT_ERASED: + case FL_ERR_NOT_ERASED: puts ("Flash not Erased\n"); break; - case ERR_PROTECTED: + case FL_ERR_PROTECTED: puts ("Can't write to protected Flash sectors\n"); break; - case ERR_INVAL: + case FL_ERR_INVAL: puts ("Outside available Flash\n"); break; - case ERR_ALIGN: + case FL_ERR_ALIGN: puts ("Start and/or end address not on sector boundary\n"); break; - case ERR_UNKNOWN_FLASH_VENDOR: + case FL_ERR_UNKNOWN_FLASH_VENDOR: puts ("Unknown Vendor of Flash\n"); break; - case ERR_UNKNOWN_FLASH_TYPE: + case FL_ERR_UNKNOWN_FLASH_TYPE: puts ("Unknown Type of Flash\n"); break; - case ERR_PROG_ERROR: + case FL_ERR_PROG_ERROR: puts ("General Flash Programming Error\n"); break; - case ERR_ABORTED: + case FL_ERR_ABORTED: puts("Flash Programming Aborted\n"); break; default: diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c index c26615821c8..e5c8df750b7 100644 --- a/drivers/mtd/altera_qspi.c +++ b/drivers/mtd/altera_qspi.c @@ -96,7 +96,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last) ret = mtd_erase(mtd, &instr); flash_set_verbose(0); if (ret) - return ERR_PROTECTED; + return FL_ERR_PROTECTED; puts(" done\n"); return 0; @@ -114,7 +114,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) ret = mtd_write(mtd, to, cnt, &retlen, src); if (ret) - return ERR_PROTECTED; + return FL_ERR_PROTECTED; return 0; } diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index a7826e81c17..e50502824ac 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -593,11 +593,11 @@ static int flash_status_check(flash_info_t *info, flash_sect_t sector, flash_read_long(info, sector, 0)); flash_write_cmd(info, sector, 0, info->cmd_reset); udelay(1); - return ERR_TIMEOUT; + return FL_ERR_TIMEOUT; } udelay(1); /* also triggers watchdog */ } - return ERR_OK; + return FL_ERR_OK; } /*----------------------------------------------------------------------- @@ -616,9 +616,9 @@ static int flash_full_status_check(flash_info_t *info, flash_sect_t sector, case CFI_CMDSET_INTEL_PROG_REGIONS: case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_STANDARD: - if (retcode == ERR_OK && + if (retcode == FL_ERR_OK && !flash_isset(info, sector, 0, FLASH_STATUS_DONE)) { - retcode = ERR_INVAL; + retcode = FL_ERR_INVAL; printf("Flash %s error at address %lx\n", prompt, info->start[sector]); if (flash_isset(info, sector, 0, FLASH_STATUS_ECLBS | @@ -627,14 +627,14 @@ static int flash_full_status_check(flash_info_t *info, flash_sect_t sector, } else if (flash_isset(info, sector, 0, FLASH_STATUS_ECLBS)) { puts("Block Erase Error.\n"); - retcode = ERR_NOT_ERASED; + retcode = FL_ERR_NOT_ERASED; } else if (flash_isset(info, sector, 0, FLASH_STATUS_PSLBS)) { puts("Locking Error\n"); } if (flash_isset(info, sector, 0, FLASH_STATUS_DPS)) { puts("Block locked.\n"); - retcode = ERR_PROTECTED; + retcode = FL_ERR_PROTECTED; } if (flash_isset(info, sector, 0, FLASH_STATUS_VPENS)) puts("Vpp Low Error.\n"); @@ -702,12 +702,12 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst, if (get_timer(start) > tout) { printf("Flash %s timeout at address %lx data %lx\n", prompt, (ulong)dst, (ulong)flash_read8(dst)); - return ERR_TIMEOUT; + return FL_ERR_TIMEOUT; } udelay(1); /* also triggers watchdog */ } #endif /* CONFIG_SYS_CFI_FLASH_STATUS_POLL */ - return ERR_OK; + return FL_ERR_OK; } /*----------------------------------------------------------------------- @@ -810,7 +810,7 @@ static int flash_write_cfiword(flash_info_t *info, ulong dest, cfiword_t cword) break; } if (!flag) - return ERR_NOT_ERASED; + return FL_ERR_NOT_ERASED; /* Disable interrupts which might cause a timeout here */ flag = disable_interrupts(); @@ -899,7 +899,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, shift = 3; break; default: - retcode = ERR_INVAL; + retcode = FL_ERR_INVAL; goto out_unmap; } @@ -930,7 +930,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, } } if (!flag) { - retcode = ERR_NOT_ERASED; + retcode = FL_ERR_NOT_ERASED; goto out_unmap; } @@ -950,7 +950,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, retcode = flash_status_check(info, sector, info->buffer_write_tout, "write to buffer"); - if (retcode == ERR_OK) { + if (retcode == FL_ERR_OK) { /* reduce the number of loops by the width of * the port */ @@ -975,7 +975,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, src += 8, dst += 8; break; default: - retcode = ERR_INVAL; + retcode = FL_ERR_INVAL; goto out_unmap; } } @@ -1025,7 +1025,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, } break; default: - retcode = ERR_INVAL; + retcode = FL_ERR_INVAL; goto out_unmap; } @@ -1043,7 +1043,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, default: debug("Unknown Command Set\n"); - retcode = ERR_INVAL; + retcode = FL_ERR_INVAL; break; } @@ -1389,7 +1389,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) if (i > cnt) i = cnt; rc = flash_write_cfibuffer(info, wp, src, i); - if (rc != ERR_OK) + if (rc != FL_ERR_OK) return rc; i -= i & (info->portwidth - 1); wp += i; @@ -1398,7 +1398,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) FLASH_SHOW_PROGRESS(scale, dots, digit, i); /* Only check every once in a while */ if ((cnt & 0xFFFF) < buffered_size && ctrlc()) - return ERR_ABORTED; + return FL_ERR_ABORTED; } #else while (cnt >= info->portwidth) { @@ -1413,7 +1413,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) FLASH_SHOW_PROGRESS(scale, dots, digit, info->portwidth); /* Only check every once in a while */ if ((cnt & 0xFFFF) < info->portwidth && ctrlc()) - return ERR_ABORTED; + return FL_ERR_ABORTED; } #endif /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */ diff --git a/include/flash.h b/include/flash.h index 60babe8a805..32bc65e7b60 100644 --- a/include/flash.h +++ b/include/flash.h @@ -127,16 +127,16 @@ void flash_perror(int err); /*----------------------------------------------------------------------- * return codes from flash_write(): */ -#define ERR_OK 0 -#define ERR_TIMEOUT 1 -#define ERR_NOT_ERASED 2 -#define ERR_PROTECTED 4 -#define ERR_INVAL 8 -#define ERR_ALIGN 16 -#define ERR_UNKNOWN_FLASH_VENDOR 32 -#define ERR_UNKNOWN_FLASH_TYPE 64 -#define ERR_PROG_ERROR 128 -#define ERR_ABORTED 256 +#define FL_ERR_OK 0 +#define FL_ERR_TIMEOUT 1 +#define FL_ERR_NOT_ERASED 2 +#define FL_ERR_PROTECTED 4 +#define FL_ERR_INVAL 8 +#define FL_ERR_ALIGN 16 +#define FL_ERR_UNKNOWN_FLASH_VENDOR 32 +#define FL_ERR_UNKNOWN_FLASH_TYPE 64 +#define FL_ERR_PROG_ERROR 128 +#define FL_ERR_ABORTED 256 /*----------------------------------------------------------------------- * Protection Flags for flash_protect(): From patchwork Wed Sep 11 09:58:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827375 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp710246wrc; Wed, 11 Sep 2024 02:59:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMkRZLsu4Efnyyhdgd0GGBMR1bL+ft2FIu43ap+Zg7LBr8FoSLUBkflh/Vqg6NdrCPLz0Dew==@linaro.org X-Google-Smtp-Source: AGHT+IECp0zRROoiouvATjSDFC77WjwArHkxX2JJLCxuPyXBvqzVxorJh4ECs64cNQFqOB9Yox/x X-Received: by 2002:a05:600c:4753:b0:42b:ac3d:3abc with SMTP id 5b1f17b1804b1-42c9f9e08famr163428605e9.24.1726048764603; Wed, 11 Sep 2024 02:59:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048764; cv=none; d=google.com; s=arc-20240605; b=LEZdsR8zMOV9dKUCD/BxxKe0+yQ+e3lBnlvF5+Dr4x3UnX6gaHfM4SPymmJLyYkSif b3vydgG2EVvqHHfqO5si1CzEkhITQiaHYrVqUUqm5sNWDM3bef6p84lyYyl+1/533c+N xGFCKYCaRf87AxfJPSWyEuqRx2ELUyN15UGbAZAqTDNfmD1FjEbMQfQ8vS5XgOXdwGom 1++3xlvGaw2C+Yp1d4Pklr/1N2tetx7sv+8RDxFJi7GSLuGXKZ36spXxjeRXJVBcM9GV tUzcIDLlaXr7EGgy2ktfMnEAzmhg0+vgB3pX8CvWiJxASOZHyJEpuqltIHFeEK2/ftj6 cnXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zoK8FOzTIrKWJpua5WQQxt2OxRail5WV2S9LpE9drIs=; fh=OpEzreGXgdID6UqvuvTXlJix90VdQ3XctaBPoGSgBxo=; b=EJRQO7Wyy5Nm1yrQ2r11u4ZchylRHAvu+9397f67Hn2tP8RgyGkFIWaP2crmMPvTFd J7TBnG0CeBqsJyyXDog0bmxZBlJ/jU08rnPqVATb5lLkgfH0JW51vA3ChNEjXXfzliVY lmYSy6iBtml+gmMqFPBFTJlL40yDUzIzDQD/e+1dSLGblFIzA4FerbgRB9UzkpfTHq0O FgvsMWNEl2ftshvUsC7Ncs93rANV9HFV6vUdq7cGN/Nj80+yj2WUo50l2pYafbtPnSs3 4umCI1rU5vDk/Lm0E0828SKLWWckVJDcXaCU3eB8XNCzrGDT3Q9eYqfiPGVDhATSWXv7 AxZA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GNrcbgpg; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id 5b1f17b1804b1-42caeb50023si46562875e9.55.2024.09.11.02.59.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:59:24 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GNrcbgpg; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D31198924B; Wed, 11 Sep 2024 11:58:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="GNrcbgpg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 32E338923E; Wed, 11 Sep 2024 11:58:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) (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 EDB5D89245 for ; Wed, 11 Sep 2024 11:58:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-42cb6f3a5bcso40870285e9.2 for ; Wed, 11 Sep 2024 02:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048731; x=1726653531; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zoK8FOzTIrKWJpua5WQQxt2OxRail5WV2S9LpE9drIs=; b=GNrcbgpgdrMxtZk24+RyjtMThRaE5ykzaeDfEftJnF2pxao5s/A8lHlMxk7p7n9YBY bhXv1+IhBpe+Mm3xvH8KGps2OvLlHlkJHMjv37TtlPjcqOjsTl3WGFe2/LSC/B1aHgVc 2ntC/XLBe1D529a/Aqgn50CupRgYAMhV6GXQg96YWP1d3oceJcb4EpPrjesVH/64J6WE B9SpcXQlWDaguSLSXnTNSooPkkIaP2vyDFZjg6beH33Tc9QPnoNkY5EBfY67n0thxWPv qQaTyeW53O+yy7DW5rWdgzgyeSQEJkjhsq4BxN8MHSTQvz5oBr6q/pFt/ZzYDVgRFg0y mvyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048731; x=1726653531; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zoK8FOzTIrKWJpua5WQQxt2OxRail5WV2S9LpE9drIs=; b=UdFhPbq/bbwvqJ5K8ZNf1CKU2kRh3x4yAMVQLPAF5WZcXnNlcNzn5TuoW5tuG1Lmy8 nt8FUD/bkr+Q2xWMgKtIxyfekPHUWknZnAWdsWOvdspCh6U5iCFR+hO6VNxsBkWgNlZJ MaTpAw2zvO34xf2H3VFQnw1C/EoV9/YxXAUNM1Dz3okXAM/i2eDgUTxH7WeVIn99/Ba0 HNIPrh+Se3VlUD+7eQqHzvz4G8WHhAtKXOwcIywQV+6DTmJUJYUcVbSHjFCOo1os/EIK ve4ge7fqNGEnnPKNCQeUuySajHvhQPCLQWEe3Sq20dzXjA75NWpDDKT7ihbTng437uDm 20xw== X-Gm-Message-State: AOJu0YwnRodZNh3VWolBR8MSuYB3S9LJETT+y0H359lEvUJuR/A1Eyg5 HIiWjaSDlP3UZPpedU2BHwmARhTPsy7r0Zv0kIPJb+az97GNleEPKW2dWh6yiOmjQrLTuM4knbr HH+wKIw== X-Received: by 2002:a05:600c:22cf:b0:42c:a8cb:6a5a with SMTP id 5b1f17b1804b1-42ca8cb6b54mr150224675e9.15.1726048731086; Wed, 11 Sep 2024 02:58:51 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:50 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Heiko Schocher , Eugen Hristev , Tom Rini , Nicolas Ferre , Jakub Klama , Artur Rojek , Stefan Roese Subject: [PATCH v4 03/15] at91: rename mem_init() to at91_mem_init() Date: Wed, 11 Sep 2024 11:58:16 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean The AT91-based platforms have a mem_init() function declared in arch/arm/mach-at91/include/mach/at91_common.h and implemented in various places. In preparation of the introduction of the lwIP networking library which also has a global mem_init() function, rename the AT91 one to at91_mem_init(). Signed-off-by: Jerome Forissier Reviewed-by: Peter Robinson Reviewed-by: Ilias Apalodimas Reviewed-by: Heiko Schocher Reviewed-by: Hari Prasath Gujulan Elango --- arch/arm/mach-at91/include/mach/at91_common.h | 2 +- arch/arm/mach-at91/spl_at91.c | 2 +- arch/arm/mach-at91/spl_atmel.c | 2 +- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 2 +- board/atmel/at91sam9n12ek/at91sam9n12ek.c | 2 +- board/atmel/at91sam9x5ek/at91sam9x5ek.c | 2 +- board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 2 +- board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 2 +- board/atmel/sama5d2_icp/sama5d2_icp.c | 2 +- board/atmel/sama5d2_xplained/sama5d2_xplained.c | 2 +- board/atmel/sama5d3_xplained/sama5d3_xplained.c | 2 +- board/atmel/sama5d3xek/sama5d3xek.c | 2 +- board/atmel/sama5d4_xplained/sama5d4_xplained.c | 2 +- board/atmel/sama5d4ek/sama5d4ek.c | 2 +- board/conclusive/kstr-sama5d27/kstr-sama5d27.c | 2 +- board/gardena/smart-gateway-at91sam/spl.c | 2 +- board/siemens/corvus/board.c | 2 +- board/siemens/smartweb/smartweb.c | 2 +- board/siemens/taurus/taurus.c | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h index 683e539b1b3..8fec346c1e4 100644 --- a/arch/arm/mach-at91/include/mach/at91_common.h +++ b/arch/arm/mach-at91/include/mach/at91_common.h @@ -28,7 +28,7 @@ void at91_pllb_init(u32 pllar); void at91_mck_init(u32 mckr); void at91_mck_init_down(u32 mckr); void at91_pmc_init(void); -void mem_init(void); +void at91_mem_init(void); void at91_phy_reset(void); void at91_sdram_hw_init(void); void at91_mck_init(u32 mckr); diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c index cde1700a283..0d1233cd109 100644 --- a/arch/arm/mach-at91/spl_at91.c +++ b/arch/arm/mach-at91/spl_at91.c @@ -142,7 +142,7 @@ void board_init_f(ulong dummy) preloader_console_init(); #endif - mem_init(); + at91_mem_init(); at91_spl_board_init(); } diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c index 62a7df8a195..7bfbadf0483 100644 --- a/arch/arm/mach-at91/spl_atmel.c +++ b/arch/arm/mach-at91/spl_atmel.c @@ -134,7 +134,7 @@ void board_init_f(ulong dummy) board_early_init_f(); - mem_init(); + at91_mem_init(); ret = spl_init(); if (ret) { diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c index 3bd94d0889d..af486e977e5 100644 --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c @@ -125,7 +125,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) 2 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET); } -void mem_init(void) +void at91_mem_init(void) { struct atmel_mpddrc_config ddr2; diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c index afc0c0520e1..6f9abcbb127 100644 --- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c +++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c @@ -167,7 +167,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) 2 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET); } -void mem_init(void) +void at91_mem_init(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c index e5688c6cf13..f52b9a97731 100644 --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c @@ -181,7 +181,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) 2 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET); } -void mem_init(void) +void at91_mem_init(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c index 36995a927cf..cb3cd7ac9ae 100644 --- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c +++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c @@ -146,7 +146,7 @@ static void ddrc_conf(struct atmel_mpddrc_config *ddrc) (8 << ATMEL_MPDDRC_TPR2_TFAW_OFFSET)); } -void mem_init(void) +void at91_mem_init(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; struct atmel_mpddr *mpddrc = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC; diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c index c775d593e58..15cbd0daa6f 100644 --- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c +++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c @@ -208,7 +208,7 @@ static void ddrc_conf(struct atmel_mpddrc_config *ddrc) ddrc->cal_mr4 |= ATMEL_MPDDRC_CAL_MR4_MR4R(0xFFFE); } -void mem_init(void) +void at91_mem_init(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; struct atmel_mpddr *mpddrc = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC; diff --git a/board/atmel/sama5d2_icp/sama5d2_icp.c b/board/atmel/sama5d2_icp/sama5d2_icp.c index 986da01639f..6f0d578abf7 100644 --- a/board/atmel/sama5d2_icp/sama5d2_icp.c +++ b/board/atmel/sama5d2_icp/sama5d2_icp.c @@ -180,7 +180,7 @@ static void ddrc_conf(struct atmel_mpddrc_config *ddrc) (7 << ATMEL_MPDDRC_TPR2_TFAW_OFFSET)); } -void mem_init(void) +void at91_mem_init(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; struct atmel_mpddr *mpddrc = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC; diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c index c8a8eb49826..d104736fa7c 100644 --- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c +++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c @@ -146,7 +146,7 @@ static void ddrc_conf(struct atmel_mpddrc_config *ddrc) 7 << ATMEL_MPDDRC_TPR2_TFAW_OFFSET); } -void mem_init(void) +void at91_mem_init(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; struct atmel_mpddr *mpddrc = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC; diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c index 54cc3c4d900..f98322fb540 100644 --- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c +++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c @@ -175,7 +175,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) 8 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET); } -void mem_init(void) +void at91_mem_init(void) { struct atmel_mpddrc_config ddr2; diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c index f2e1242fcb0..28079a81517 100644 --- a/board/atmel/sama5d3xek/sama5d3xek.c +++ b/board/atmel/sama5d3xek/sama5d3xek.c @@ -241,7 +241,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) 8 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET); } -void mem_init(void) +void at91_mem_init(void) { struct atmel_mpddrc_config ddr2; diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c index 09ca16ca88c..f9112fc5321 100644 --- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c +++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c @@ -184,7 +184,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) 8 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET); } -void mem_init(void) +void at91_mem_init(void) { struct atmel_mpddrc_config ddr2; diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c index 1f8b85f0614..0bdc6adbdc8 100644 --- a/board/atmel/sama5d4ek/sama5d4ek.c +++ b/board/atmel/sama5d4ek/sama5d4ek.c @@ -169,7 +169,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) 8 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET); } -void mem_init(void) +void at91_mem_init(void) { struct atmel_mpddrc_config ddr2; const struct atmel_mpddr *mpddr = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC; diff --git a/board/conclusive/kstr-sama5d27/kstr-sama5d27.c b/board/conclusive/kstr-sama5d27/kstr-sama5d27.c index 64282ae9dc7..37750137ad9 100644 --- a/board/conclusive/kstr-sama5d27/kstr-sama5d27.c +++ b/board/conclusive/kstr-sama5d27/kstr-sama5d27.c @@ -182,7 +182,7 @@ static void ddrc_conf(struct atmel_mpddrc_config *ddrc) (8 << ATMEL_MPDDRC_TPR2_TFAW_OFFSET)); } -void mem_init(void) +void at91_mem_init(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; struct atmel_mpddr *mpddrc = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC; diff --git a/board/gardena/smart-gateway-at91sam/spl.c b/board/gardena/smart-gateway-at91sam/spl.c index fb3ec48f9c5..db9ba881884 100644 --- a/board/gardena/smart-gateway-at91sam/spl.c +++ b/board/gardena/smart-gateway-at91sam/spl.c @@ -110,7 +110,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) 2 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET); } -void mem_init(void) +void at91_mem_init(void) { struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c index 7d73d1f2b36..cd27fc1cc37 100644 --- a/board/siemens/corvus/board.c +++ b/board/siemens/corvus/board.c @@ -187,7 +187,7 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) 2 << ATMEL_MPDDRC_TPR2_TXARD_OFFSET); } -void mem_init(void) +void at91_mem_init(void) { struct atmel_mpddrc_config ddr2; diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c index 946fbc3f229..e9e4bc348cb 100644 --- a/board/siemens/smartweb/smartweb.c +++ b/board/siemens/smartweb/smartweb.c @@ -238,7 +238,7 @@ void at91_spl_board_init(void) | AT91_SDRAMC_TRP_VAL(2) | AT91_SDRAMC_TRCD_VAL(2) \ | AT91_SDRAMC_TRAS_VAL(5) | AT91_SDRAMC_TXSR_VAL(8)) -void mem_init(void) +void at91_mem_init(void) { struct at91_matrix *ma = (struct at91_matrix *)ATMEL_BASE_MATRIX; struct at91_port *port = (struct at91_port *)ATMEL_BASE_PIOC; diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index bda12a97708..3764ab48ab3 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -177,7 +177,7 @@ void sdramc_configure(unsigned int mask) sdramc_initialize(ATMEL_BASE_CS1, &setting); } -void mem_init(void) +void at91_mem_init(void) { unsigned int ram_size = 0; From patchwork Wed Sep 11 09:58:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827376 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp710306wrc; Wed, 11 Sep 2024 02:59:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWaA482kPPJaXuTbFhQnlTW1EuLbFRU2/oxA88HX16IkM9QpgXuKjrFQDyixVTH4HElcF691w==@linaro.org X-Google-Smtp-Source: AGHT+IF1H2P2/FVpw8/WzSydR5UD7Tc9Y2cuMce3WzIQakeIqqd/P+HU+YhfCLGrSGjqOZSs0Kd1 X-Received: by 2002:a05:6000:50f:b0:378:7dc1:b22 with SMTP id ffacd0b85a97d-378b0791de5mr1658347f8f.12.1726048775759; Wed, 11 Sep 2024 02:59:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048775; cv=none; d=google.com; s=arc-20240605; b=IbmlOCuHXyEHIJOGgd+dN/ehuZNU4R9Cc4f40oLTtFu9rEdLbeBcJ6Krz9sGOvlc5N 1hzbA6apnpMDJO1J6YSCWKLj0iEqipCYzC2jvPZOv3Z1A70Wgv0Ua962u1f8jNOLd8hu fuiljQvjLhN8CxWt/MZVKInaSTnz9SSljDszPELV6vZK8x4tVNtKqFdmRBPNXnOcTxG8 rd0gBN5rIA4zeF9p/Vs5dV5woQ+mBCD76oswmflGcqIvpRohMWmGi/YMi5XTqym+cHnN 5+KG/S4SpEYiL6MneX7ghfyiGD2TxQl2JEx0qM3sjrkHLeh6IwIkR4KwXkq69KF3tJ3C b14Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eyG3QXG+UUiIibtKovBRnK2Z7clawHN81b2WLACzqvU=; fh=0K4K44fQHqw6k1022Md2ulakJYB69+wgpp45D92YdEc=; b=jKQ8/w0fSGfevE6yi8UiiYJjhCZfaqr1WD04l/C6RwPxzqo/fPURpmgPSvUfZPuHcD ws3HHNWUnztrEcWiM6bLnR/zacID6ALQqvtXGmRe6qzLbkh+ye7hFEAH14TyVdg4T5ba oyBPDrmrYjjEnwrrVhC7tOo8PkYI478GzCJDBRIjdgdKMP2LMsZKZBvSIh5GTzHGnZSx oBcdL5AIQoHzUpFO3yJA1fzjn1yONab5mmPwvq4BzztEoymqZtRmj8YvnHwzqvQbvE10 9Abh3jay6N4NZ2rP6IXdn99+UOe5p7QgNhYkMSDVRfml9R0zqwguq0OLZcwnns0FXylA aNbg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aQfqUaNm; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ffacd0b85a97d-378956ce6ebsi3897141f8f.759.2024.09.11.02.59.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:59:35 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aQfqUaNm; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4521E89252; Wed, 11 Sep 2024 11:58:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="aQfqUaNm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9931F89240; Wed, 11 Sep 2024 11:58:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) (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 B87328923A for ; Wed, 11 Sep 2024 11:58:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-374b9761eecso1378095f8f.2 for ; Wed, 11 Sep 2024 02:58:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048732; x=1726653532; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eyG3QXG+UUiIibtKovBRnK2Z7clawHN81b2WLACzqvU=; b=aQfqUaNmNwfile+AsQ7hQTrvuPtdM/lD0Jfot0DdYWNhfqOBdYTdgLQroBjAY29zjs rh6tE7osGHaj9tTPmyPhakFn+rvuD7OK1Wb/WrGldWOa5hliYOX6COh3oyQvx4SB+hel hj6sPgBxqCR0L/ABLEX69gSjtiMTMHXdNkMb+6Bob8iH5jzQ4iD8D62MpsOT4Pjme4lN m18yVWCNqS77fpOGc2cRbNoXJL+NX1+fE7BQk8VZ4y2SwbalH0YxM+3HHsD3ZEOgDqVR igksqUIA+Chw3kC1hzswSnEZ4b44+Fw8nD1R+JQS7SImQ7XMx81EwnvJm1VUGyl7CtB5 6K8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048732; x=1726653532; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eyG3QXG+UUiIibtKovBRnK2Z7clawHN81b2WLACzqvU=; b=fMFSGV7BYwQmeagHo0PJbx8jL/+CBvVWGZ+S2Py/FemUAr579mRD1dcYb3Gp+CbctY hILo97eWU3eL89C7RoevyM29swpnfS65mjRKO2vxxQBO23zoUe8gCvCv6hgmQCL5aywd 6x5QCGslPsDQNo3A46jQ+Q6MvyXD4SeEijx7Su9oKp1CuAwWNCwyXi1DRNaQnb7SJG+b wxRXAL4k23zDv91H9LUuYD0oWkUgtvSLkiJ3l6Oxht+4jnAQqw23lKTzpFWMTQ6ZhEAB 0GAcL4Nz0ohefxbBcvrx5zMp2xB/7HlY+5GXGdndyx+uiL/Du4MTnpgV+1A1z/+LqErT 9zBw== X-Gm-Message-State: AOJu0YyXWHnddr9i2SWjKh0D2QX6czhvH5HQlxyJ3l9ICpb3VEwuaZ7q aooLizlPr6QtYqlIVwCh2DsxaWZoMzuFksdtDI5kReRHG8yBk27g2mpqm1al2locKY3aJFnBYi1 JeYj19w== X-Received: by 2002:adf:ec0d:0:b0:368:64e:a7dd with SMTP id ffacd0b85a97d-378b08003bbmr1595779f8f.53.1726048731998; Wed, 11 Sep 2024 02:58:51 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:51 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini Subject: [PATCH v4 04/15] arm: omap2: add missing #include Date: Wed, 11 Sep 2024 11:58:17 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean emac.c implements cpu_eth_init() so it needs to pull the corresponding header file. Signed-off-by: Jerome Forissier Reviewed-by: Tom Rini Reviewed-by: Peter Robinson Reviewed-by: Ilias Apalodimas --- arch/arm/mach-omap2/omap3/emac.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-omap2/omap3/emac.c b/arch/arm/mach-omap2/omap3/emac.c index 7348e92cabd..1e30a06361d 100644 --- a/arch/arm/mach-omap2/omap3/emac.c +++ b/arch/arm/mach-omap2/omap3/emac.c @@ -9,6 +9,7 @@ #include #include #include +#include /* * Initializes on-chip ethernet controllers. From patchwork Wed Sep 11 09:58:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827377 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp710356wrc; Wed, 11 Sep 2024 02:59:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWyCeIurynm6x9A6TL4tSP9vcikLNmpxeyttku0Cta96TByN7U35TPgF26VZdeuZSKap9Lhsw==@linaro.org X-Google-Smtp-Source: AGHT+IGOtL3O2t2nOIQjLfz7oO+41XUHDZJtI8YBbixEa2ybgHy7vdy8JDa6aMfJVKLdgSeh/c1Q X-Received: by 2002:a5d:6212:0:b0:368:31c7:19dd with SMTP id ffacd0b85a97d-378895b79e0mr11376569f8f.5.1726048786677; Wed, 11 Sep 2024 02:59:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048786; cv=none; d=google.com; s=arc-20240605; b=M2yomiNtPfZWHD72c9Zq/8CznhG9yFDZ/P5eC2ufsq1TJTNRZPSwutGCtwL3vp1kb5 RSeXbbru3jmyC77k82+M1Tz8qhDfrFgean4dwY/XdqSG4S2om1CR6inkEHfJhUocCbbe GbYcUrFagP7vyRMQZxpXoZkli+8Wn0ekljS/PLCWm5OIzkUz+JBdYJBIaWYcQu2XtK1k ItIihzjbTBToPR8yd3KCRtq6NOtsTK33cGDbuJYJPwGEVTNbDnBirVv0B9wMaPfTGDjQ Ty3S+xIocOYNX4CyTyll1q1fT79Dt8JSqhd8CVCDIVFfX42liVQ7KSG94oqpjcp8liKZ Ps6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7Ly69i+XeCnYQgS8pZW1S63YOkSlgFrIkxkE3L1wYgI=; fh=EAnZL4IFRrLi/kZZl+bxs1QDWyO5W9ePvI/a8qBrx+4=; b=fhsqNsH7R1NIIf6qNPe8JyPDTLmtatpA/Lz69mOiuozy9nNy3C2ZU+ANVcvMnlQekK jru5B/x/SOFKnWLmN+H9A08bNSQg4U9b0YcIn20ryHcg1o6PEaLtcLpkaXTsymaE8mNY 5RDDO3xe0OkM3dYGu5nUAzTz1x6s/H8E56s02pp5GqFA7X73pwhB5ViYGEnbr9Rv94Kx 1Qbvpt9GzXu7IMPCznNO+5aDiD/IBHQvRBXDFSbfaNeEBfZIuIr7iEZ944WiQc5N3WGj 4W0/cuPTIX90QFldFjb+b/5mMO98+TYagngpL54f1KHsxvSkIBx/DRkirME+olSUU//B 8LZg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ypzULrHV; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ffacd0b85a97d-378956cf024si3879561f8f.817.2024.09.11.02.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:59:46 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ypzULrHV; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B14D78925F; Wed, 11 Sep 2024 11:58:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="ypzULrHV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 828998924B; Wed, 11 Sep 2024 11:58:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) (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 932CD8923C for ; Wed, 11 Sep 2024 11:58:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3787f30d892so4018963f8f.0 for ; Wed, 11 Sep 2024 02:58:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048733; x=1726653533; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7Ly69i+XeCnYQgS8pZW1S63YOkSlgFrIkxkE3L1wYgI=; b=ypzULrHVCRl1S5fA2I998PxFYLH/FAAPAQHTGh+wGri/tqKcAuAJERnz5UPRLxi7in 5t8ukjBZcNXXnz2y5Ggd3SaU3qlQNCJKjKMjZjJYTt1nZp7yePRHEvGAG1SpZhFEZBZ8 lf+oGIyuORyIQPGKBJ7KcgQ1/48EJzwfSk/lgPDa9z41BjKjbYQblzvUAUWJQwZ3CLay obheZ4PaaqD7ZcjYqiv4t2wUxVAfll5AvvyrQLBrm3uHAOC5uZtbi2QmdoahXARxWoac P2UmaMzePT5OjBJ9mHWiY9N9hZbU6mPJdexVsCKDBQYCrfR3ikakeF9NyS3rwgPPSdYl RWmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048733; x=1726653533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7Ly69i+XeCnYQgS8pZW1S63YOkSlgFrIkxkE3L1wYgI=; b=O8b2T0okef16fT+7mThV104xoiXdoxHe317doO5lYpBGt8/huvHNOZdMEgr0YjzdqE ftJRDGVeGdnnseNRvD0gRXXbQ9SVV2Q4/37CF5FHQGghim8okw4kKvRKDI0SDjTZe8EH 231iAflHmldzl0I+ZsRz/nW4KHC7LEjmc0lNst+jnX/bvPOqHsNjD8Ny+rSWqSWLr8OJ rcP6vRRUD9ZNYo3C/YTRndcj4K8TrYaZqHV9NonOWFyCMTMGJkAeTELc7ZY55GFHjY82 s/RLDz/0jaTCer2krg6jTYVFQSoF3mvRFSrGanyC3aKF3FaT+9CSHJ5vjhXcOCr2mAJT 8PQg== X-Gm-Message-State: AOJu0Yy+6iqjJGsiKmIEORO9QEZjRsRU2CsyoDCk0JyuVwDZc8ITWagC FULvNXtzzcgsYoT4toza3t7Bk2zKo1CgusQ60yMLudNQM5tAkt2ItgTjFrdAxd6XF28y1C8lu9A mf4g5zw== X-Received: by 2002:adf:e242:0:b0:371:8c19:f5e6 with SMTP id ffacd0b85a97d-378896a3e97mr11308085f8f.40.1726048732758; Wed, 11 Sep 2024 02:58:52 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:52 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Joe Hershberger , Ramon Fried , Tom Rini Subject: [PATCH v4 05/15] net: fm: call dtsec_init_phy() only when it is defined Date: Wed, 11 Sep 2024 11:58:18 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean dtsec_init_phy() is defined only with MII so add the proper conditional in the caller code. Signed-off-by: Jerome Forissier Reviewed-by: Simon Glass --- drivers/net/fm/eth.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index 19f3f0fef07..63fe4b2d33c 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -26,7 +26,8 @@ #include "fm.h" -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) && !defined(BITBANGMII) +#if ((defined(CONFIG_MII) || defined(CONFIG_CMD_MII)) && \ + !defined(CONFIG_BITBANGMII)) #define TBIANA_SETTINGS (TBIANA_ASYMMETRIC_PAUSE | TBIANA_SYMMETRIC_PAUSE | \ TBIANA_FULL_DUPLEX) @@ -701,8 +702,11 @@ static int init_phy(struct fm_eth *fm_eth) supported |= SUPPORTED_2500baseX_Full; #endif +#if (CONFIG_IS_ENABLED(MII) || CONFIG_IS_ENABLED(CMD_MII)) && \ + !CONFIG_IS_ENABLED(BITBANGMII) if (fm_eth->type == FM_ETH_1G_E) dtsec_init_phy(fm_eth); +#endif #ifdef CONFIG_PHYLIB #ifdef CONFIG_DM_MDIO From patchwork Wed Sep 11 09:58:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827378 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp710423wrc; Wed, 11 Sep 2024 02:59:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXjXHEoNOqg+cDWxI4AGAoa9YdxVWtjke45ziZPDWrRzF7FJD/LjOQn2q6Vz/G3mFRGlN3gng==@linaro.org X-Google-Smtp-Source: AGHT+IHhZKa+Y3hqiS7Bi5VaBb3L2ngLGbLf0K/YdBGtQwlkKXAgetR6Y+O69JAVdIqkdZ9QnitT X-Received: by 2002:adf:ee47:0:b0:371:82ec:206e with SMTP id ffacd0b85a97d-378b0791f05mr1678361f8f.5.1726048798724; Wed, 11 Sep 2024 02:59:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048798; cv=none; d=google.com; s=arc-20240605; b=NOqNYZVciif97toKFQAhWy7Gv7TXxeuCEuZnvQR7TQGXwNQILsY8NdodiYjfKz2txe K41Q2Qf8xNsAycSxOGQYnh027CybXFnXaL6/z45pciTp71UC7G/3XqZwGzfXNLfd8f9X 19GLBCbwMf/iCBk7/2GOz4wCM9cRu9JQw8IhQK+TUKkO+JP8E4DAaDYgXPrlYkf4fjWm loFhrX8ASApRlzHxS0CFLwdoAb/T48E1QXAiZkBrXliIlBX5yiA0+gshrvJrirZjrt2x bxWBYQISaIjThH2xhFHwGO9kvFLGfyUMrdMJdmm7IOz0JiDITcP4MRSiOu4uuo27w4ja JnUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2+kKclKOdggmvQLqu7epBFwPbgxjPaxHLYxPdceOudQ=; fh=m0pQEFrVGLt9C+Sns6fXtYwPZqBEeGcTeHmq/e/9E3U=; b=iBtCjz8JHZhKmbQLuEHOWWPhtXEQnJT6LkrVguxSqpVks9pDAAbo39ME64lD+pk9k2 3rdySgg/iRvwqpjMo1Rdh5IWP0TIT++wLNt+eMRSRwbCFrmhlm2xW4R5wxS3WpdK06dB ITiwk70EEXxv4jW8rilPpt8WKk5w1Soq5ZhBoKqgOq5z6UObGrZ5lp73DO1trT8o0Y2h domRujEaVF5EWsuJWd7Y3Optj3tJU188/x68ugVgv0kW/pnYiJUNPKJXvGQQfC82BOlS FRwqquoveDaxUkX0iHjMiuNmHJ9+5wUZEqPgi1ppfRqe0wTvAmiG+JmJyvmUeboB1gZb G6Qg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tHbAjfCC; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ffacd0b85a97d-378956b8e88si4091084f8f.665.2024.09.11.02.59.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:59:58 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tHbAjfCC; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1848789266; Wed, 11 Sep 2024 11:58:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="tHbAjfCC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7839C89254; Wed, 11 Sep 2024 11:58:56 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) (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 98BCB8923F for ; Wed, 11 Sep 2024 11:58:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-42cb1e623d1so17757225e9.0 for ; Wed, 11 Sep 2024 02:58:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048734; x=1726653534; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2+kKclKOdggmvQLqu7epBFwPbgxjPaxHLYxPdceOudQ=; b=tHbAjfCCbF1fxSkwIt5lHG91PyB60hyIxoFEPHeL5cujVFxkTxIWW4OuT/XKWJiwSu HTuxJThKZ1Oc2VuoLELOpcCiWzQYIvBXJKkcm6BBe7iC4ejgOxCTVZvPfkZqHo5Umlwu Ax4GtmKDo2hEX6166CK6IGA225P/bUfT4+ObWW1oAEPeTd8Xr9qirOwiV2GOHdUX/yJg hjkv26ekb4zN8RuSuhttui0GPYjLUudGN1YCwgcMaC/xxYx1bYbI0j8VzOLBw5SQKSlY IThK267iPvYDEJEfAQaCEJhyVwVmvbAIrCrF2arNZenziG5OpNmj8+g4EwNOzX4Mw2Sy QzLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048734; x=1726653534; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2+kKclKOdggmvQLqu7epBFwPbgxjPaxHLYxPdceOudQ=; b=BN9aogRikSoqMDoj55egQM2snnXMKsMSmgQP0064C1DnogqBFd9ggja4bJrhI7n4A7 lDOWjbNzEo39L2ffZj2glKhV4x0xKqDCg05/BkgnNb9GYMa8Rs3dWYQ79N5sL+PTB4V/ e69RfptsFQHxvWvMGYUIUWfgtO6NgXI+OypMye/pU0Sz6ymthU2t1VTDnONALRNg8HPs nxVTG842Tll08Qx38NGGaANh6dTLyA9T02S4Eff8nnbW8GKY0PC+fZBs/MDSOnhfBF8R yyfXMdnZGLlQGkeeZ6ucHt0HG077G3lbCA9p2XooOgcDn3qqyJNo3R9r/vgAMNeHOT3k +GQg== X-Gm-Message-State: AOJu0Yza4yB7oDokoPvJKwwQVV8rpHSBIwayOtdycSLg5iqJVZ50+0eB YcTkL7W3MEDGKU1rg3VkQtbXN2PHyHB/ywBmpoCKxcWs16L2zJT/bafuSTAzT9OkzvkwKO2CNcp UJZhg/g== X-Received: by 2002:a05:600c:3505:b0:42c:b950:680b with SMTP id 5b1f17b1804b1-42ccd32def2mr18513405e9.20.1726048733758; Wed, 11 Sep 2024 02:58:53 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:53 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Joe Hershberger , Ramon Fried , Tom Rini , Simon Glass , Yasuharu Shibata , Sughosh Ganu , Masahisa Kojima , Marek Vasut Subject: [PATCH v4 06/15] net: wget: removed unused function wget_success() Date: Wed, 11 Sep 2024 11:58:19 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean wget_success() is used nowhere so remove it. Signed-off-by: Jerome Forissier Reviewed-by: Ilias Apalodimas Reviewed-by: Peter Robinson --- net/wget.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/net/wget.c b/net/wget.c index 4a168641c65..6ebf9bca0d8 100644 --- a/net/wget.c +++ b/net/wget.c @@ -196,13 +196,6 @@ void wget_fail(char *error_message, unsigned int tcp_seq_num, wget_send(action, tcp_seq_num, tcp_ack_num, 0); } -void wget_success(u8 action, unsigned int tcp_seq_num, - unsigned int tcp_ack_num, int len, int packets) -{ - printf("Packets received %d, Transfer Successful\n", packets); - wget_send(action, tcp_seq_num, tcp_ack_num, len); -} - /* * Interfaces of U-BOOT */ From patchwork Wed Sep 11 09:58:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827379 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp710539wrc; Wed, 11 Sep 2024 03:00:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVD9BECURkughw/O/oCK6PhNHzLNQPwAnUKe+SAaZPKebKmC8bGQlbKP0VXW32HWtW9dkKsGg==@linaro.org X-Google-Smtp-Source: AGHT+IFWP8p9bjJYUp3zHbE83U0oLw/wxorOZ5M+iQXnys+vg7xuiofNdu82D9MJhLYyInND4wNV X-Received: by 2002:a5d:453c:0:b0:377:4aa2:3af8 with SMTP id ffacd0b85a97d-3789229d8ffmr11745034f8f.13.1726048813724; Wed, 11 Sep 2024 03:00:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048813; cv=none; d=google.com; s=arc-20240605; b=Qgz1WBgnICfAUqZ0oM3kPD1YB1xKtp8segGd3IPFLsimb8WIvCzB4FS78tufkkaXy8 XVtfyl6/I9HVB9QTghe4wcIrr7qHZ9Vr0BkEOUZRc0WxEhMpRJVcaVV+q2r9dxAyHcL8 m/21q9QLYWH7BxlJfejjy7mOYPXTLPvUHdq1naJzXQN8+KAWkshSob4hWE9ebzYtwP97 biUce2Fh+TuSVvVlDFF/Co0AjuTqq5ONVp6qKAY3pplpYa9fY4P6yTlNzzItZjQ8xKet aRwpEv8xVsDwGzwOFUgJ8zHkT0ygfXeiV1rptwb1/rP3rOSaov022xZpIqAp8aMBsYe2 GprQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8i3lBROvhfrY82vIccP41xA0yhZbBOfEI92vYpX/wGs=; fh=wqlC5ZCksxtIKhW3Qt4fOjT33qsCBGebXnH5MgM1b78=; b=kdTTVJTE/r6waqHoDJUyWmmTzZwTo5x+MjuS9zgYgZFhUDPS3RCFkTWrOPtJwavoL3 XhO8OvS+kJCwTbzRWnH0rKoPKNzJbjJgFPoIsxJmgf50qr99ZefY6kiXdyr+tVGNMVmY GPUx/9PafK73ZAIB34j4deG0FdZCEbiZIkS/gEOsFb9eJinpW58R6d+SZfVIHvhJdbMm gZYu1c3N4RObEpiB0AhK7g5Kig5oJfH1fnPlkYADScQxlqppOpL9thQMgrbLdJ3JDohA lcvYi0C1fUIyBea2epJnsOTtPMbFkbDjaTG9yY7bd+HO5mAt7ZPSyNM32dzUKusaPUr5 LgGw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hCeTzT43; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id ffacd0b85a97d-37895627719si4088282f8f.265.2024.09.11.03.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 03:00:13 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hCeTzT43; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 93A498926C; Wed, 11 Sep 2024 11:58:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="hCeTzT43"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3631389256; Wed, 11 Sep 2024 11:58:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) (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 533F18923B for ; Wed, 11 Sep 2024 11:58:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-42cb6f3a5bcso40871005e9.2 for ; Wed, 11 Sep 2024 02:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048734; x=1726653534; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8i3lBROvhfrY82vIccP41xA0yhZbBOfEI92vYpX/wGs=; b=hCeTzT43HA+a1PfRqaqdJAj/J6kf7PpPHDEM36wMMvTh3lBPLq/SQnL2R2b0dYo5bF OGsxi7yEEXrxlDuUgsOfTiqlNKE5xIVif3YSI5yh9eokcmqoOevl6VmYnQTGIyI+hWFG OqKsTYWn3D6RV71D4XXZAv27jMttDkST/o+nIX15+s3eb4a5pMc/H78zsIeaA99pc/5j rv6zmCELZcjZHwGi9oF80eHsIX/gP66K2DSvZa9cOWczaBqiLSqtAIkmoHrQGerWdOjS Vab+qJ8igYdlJLjm7xTnpVplVC+9zVR8HHRso1sY0doushBDmUhnlsi77gMQLOXC5dvR UlnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048734; x=1726653534; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8i3lBROvhfrY82vIccP41xA0yhZbBOfEI92vYpX/wGs=; b=gIFtcNtjGK6PD2bADb+D2Pun0qUhKEoB8EJ5fSrVVnIfTw5+oZ0hAfFQMQ7NN3L0nf LPs2n1if8hZ5tJbU7haNDW0jVIwMvkakp5cZCCzJwErH5jZ6CAeM6hOnxof3eUU169NN a0uUaNt637fIE7ADyuLpXb9O7SVdFQBWgUEFAxIEglJ7E4jkSVHMZkkdI7oBsmQqBXse yrCIxD42MszROUs+2gsLTWlBSNoia9v2tNNs+lvyvhzm9oAeqDKNTFYeOKmjJD/9r0pi zmjsRpJeUrdJprJgO2A+qNjNFjdLj6ilHNJHn3dQp9uWK3gWT7r/5B9hwMfy4sf6T1FP iYQw== X-Gm-Message-State: AOJu0Yw+/h8qxW8KcdiaV+JW5XRgAPBOHPEGvE5gAxB8HgFpkGfz63sQ 9VP5CZMTflAhu3aBANBx8nJOxORpQgPlmdUffHmHEx5KhfpEbnbgwQgIb0RFwnwIp9nQ0bMeia2 ahePL+g== X-Received: by 2002:a05:600c:548e:b0:42c:c401:6d6f with SMTP id 5b1f17b1804b1-42cc4017032mr48157255e9.16.1726048734541; Wed, 11 Sep 2024 02:58:54 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:54 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Joe Hershberger , Ramon Fried , Tom Rini , Nicolas Frattaroli , Marek Vasut Subject: [PATCH v4 07/15] net: phy: ncsi: depend on NET Date: Wed, 11 Sep 2024 11:58:20 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean PHY_NCSI enables drivers/net/phy/ncsi.c which calls net_loop() and net_set_timeout_handler(). That's the legacy NET stack (as opposed to NET_LWIP). Therefore add the dependency to Kconfig. Signed-off-by: Jerome Forissier Reviewed-by: Peter Robinson Reviewed-by: Ilias Apalodimas --- drivers/net/phy/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 73064b2af68..a9efc509814 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -368,6 +368,7 @@ config PHY_FIXED config PHY_NCSI bool "NC-SI based PHY" + depends on NET endif #PHYLIB From patchwork Wed Sep 11 09:58:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827380 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp710679wrc; Wed, 11 Sep 2024 03:00:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWwSNwqtWJPlJzWUGCAbREiwAIjmNpb9hkDOdUokAkcMHFDyXI7lexCDS6UmK2dDpw5C6YoGA==@linaro.org X-Google-Smtp-Source: AGHT+IGRowewijWic/y7cOdYQ60wTiBJUftx4LelfAE+UyBSjSs/9N0/NDmcP+79PZFO9VPiAmzI X-Received: by 2002:a5d:452b:0:b0:374:af19:7992 with SMTP id ffacd0b85a97d-378895b91b2mr10625872f8f.7.1726048827098; Wed, 11 Sep 2024 03:00:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048827; cv=none; d=google.com; s=arc-20240605; b=Y3lrHQMyxX/sBbt3xyfxZj0+7RDXFv7n+TcUuC8P26J+GaIMYImvZlyH+RJJqsqM24 UKH7Pvl8YnmZKOSIOf8qjPZ6oLwIy8lwOWUgfIajXuOQH/i5BR3lvAtP63xJ5zutqlkN nFCVVSaRzAPqPFLrMqtthjvq3Ee4kgfwXggX7NMzeT+pnnT1m0pv+xKR8ISJHtErz+EN u0MDHBDZOoNXmMyakHJ5tRxp33g0i2K3rmYwgCLwpOpvLKnGQBvzRU26cOyrpD/a5QWH hy4MasEzWtwc+9cayr5rsh2NKRcsGuNCse4Py94yRh9GDD3MLdj8ILLc9CPn65o/idOx OOYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/aZhjPOxUdNatWRE5U6jLTXqt2WXtbafXRW+DW+Zrno=; fh=S832Kiw+dlAMCM8T3nvSKCiYd6VY26hTKzCgWLWp8+M=; b=Wq7cPK6+s0TFgcKH4DXtD2MyKBKOEiH5AF8BlrK2vq3GR+y6w4q8roDITUzgQu9RqC SKBwLmNTbFG8wgQ3WkYCwATEGzwab/tMZFEyFXrNVDTTy4O8KpqhLiSUdbKPwzwKw2RX d3KN8ZLxtpFjgBrXLAMJ8cZO0sa32NEU4iXpYMx//Kso+JynGZolhcNZOQePHQjLDvwd 6XPfTutv4waBuQflWtKwlEfhcOlXIf5Cjnm+RKYXQXCYlucN443J4XZd+ac3ZXmC7T2Z NKQXIXTJmOdSD/+f4nax2lGUxnQrxV6T9iwQkFOfE8OwFbALNvxkQNi0zDHbsdGG1AiS +3LQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="DTntYf4/"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id ffacd0b85a97d-37895699223si3971068f8f.434.2024.09.11.03.00.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 03:00:27 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="DTntYf4/"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B76D89258; Wed, 11 Sep 2024 11:59:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="DTntYf4/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9069989251; Wed, 11 Sep 2024 11:58:58 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) (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 3EDF789250 for ; Wed, 11 Sep 2024 11:58:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-42cbaf9bfdbso22445235e9.0 for ; Wed, 11 Sep 2024 02:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048735; x=1726653535; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/aZhjPOxUdNatWRE5U6jLTXqt2WXtbafXRW+DW+Zrno=; b=DTntYf4/rqVNUSN4c7E3zkTQVoPVa6m+Ln/j+KVNY1Ke47OU9MGJcfvg/j6NAgF3z3 dnmH4ikBcVEGlD3bt+FVuUbAilEkXZfWr0BDDoTI45sXh1h/nBjIwKbbxYyAl6jjsrV5 JSjb0YELcRXjmsaALiQPcknb9o3nd6MNHfn3Qj79n8sJG9Iso/vV2pC0hgS9jfAa6FFR +mGC/a3Odjz591/9CWB5MRNEHbJBoeCwu2yDhA+LIFxzY2bAY6hkhHo+QmipZmZ/DT49 pxemOYZl9b6icuZJ5mDarOKcVpUFI/oCDpbt9HWUn90CJqscrE09jTNc3sHyA0LiMZbh FlCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048735; x=1726653535; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/aZhjPOxUdNatWRE5U6jLTXqt2WXtbafXRW+DW+Zrno=; b=SU/9Gu63cTKGy294IDXmX2EQxbK92ES+3vMkvmX1v0ET8+hWYKiyjFBaZ/wMD1PtjC ls5+AL3acbAN2emCU+2UDF829a6XryQ85tKvJIZy1flfQoTjlmPGWQTIkhb0IwIiA8EI MFegfJDgRketengKVv3XRYOo8D2jJrgNEnOz0SCXrzqAvjRTwJ1hoEnmW+pJykIgv5qX pXQFEnS+2UYiPDYX2ZVecIJUy4m2oRyP0O02OemlIJrzMujDeWrKsdBGrQjzLrS3j0+q LqDCzdRX2ALjauYbl7PeOsTD2sdK2OYXdUM2Yt6yeIPu1o0Nr5QBFPPUTtAOUkaKhBVS b5pg== X-Gm-Message-State: AOJu0YwwHeG1zzpuKN1/sgQ0NjuA4ppalWZJkCIkfF7hbcjRykxWdJiq 4sefAgXhY5x2mOQkXu4NOG9vl7qA0aN9p7+FXpNrJRRvp4HcSWk0C62cAz/xs4pF9+a80SDDc3+ CzyRYCfOi X-Received: by 2002:a05:600c:512a:b0:42c:b34d:720c with SMTP id 5b1f17b1804b1-42cb34d7363mr84215625e9.4.1726048735444; Wed, 11 Sep 2024 02:58:55 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:55 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Simon Glass , Joe Hershberger , Ramon Fried , Tom Rini , Yang Xiwen , Robert Marko , Gabor Juhos , Boon Khai Ng , Jonas Karlman Subject: [PATCH v4 08/15] net: ftgmac100: depend on NET Date: Wed, 11 Sep 2024 11:58:21 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean FTGMAC100 enables drivers/net/ftgmac100.c which uses PHY_INTERFACE_MODE_NCSI, which is defined only when PHY_NCSI is enabled. Therefore FTGMAC100 depends on PHY_NCSI. However adding such a dependency causes a "recursive dependency detected!" message, so add a dependency on NET instead (PHY_NCSI depends on NET). All in all, either the stack is NET and FTGMAC100 can be enabled, or it is NET_LWIP (or NO_NET) and it cannot. Signed-off-by: Jerome Forissier Reviewed-by: Peter Robinson Reviewed-by: Simon Glass --- drivers/net/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 6ed325517c0..e7d0ddfe25a 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -468,6 +468,7 @@ config FTMAC100 config FTGMAC100 bool "Ftgmac100 Ethernet Support" select PHYLIB + depends on NET help This driver supports the Faraday's FTGMAC100 Gigabit SoC Ethernet controller that can be found on Aspeed SoCs (which From patchwork Wed Sep 11 09:58:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827381 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp710820wrc; Wed, 11 Sep 2024 03:00:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWzvEDh0iXNP2lAM/oPRsS0XFNPRdQH8MNJ+lizqRygMzttvYLodxTRjtWhmI68p8NO9vuqmQ==@linaro.org X-Google-Smtp-Source: AGHT+IG1oEB1r9KeTbFQhxIVTCcp5zivbI6uhJY5FTkwrCPHyl8hhuSkU2R4+jMabffi9G4M4PPj X-Received: by 2002:a05:600c:a48:b0:42a:a6b8:f09f with SMTP id 5b1f17b1804b1-42c9f9e0f8bmr149886715e9.23.1726048839222; Wed, 11 Sep 2024 03:00:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048839; cv=none; d=google.com; s=arc-20240605; b=G5LMWbPCNSav9T7dJ/AJ4OUxQZM6HCpY6g1kXK2KMIfIOymKiLGsFWIfG/lX1McBnk s9i5NN7dxzQWTGtPsGgV3qSi9rO7ztyxxEy5R95vgW5iMBuzMCbbcc+qLbyQiAHgNrcM FiYBy8Yodf3as3Ary3WeqVLbuQ953taeWBZf1YnrOkpInTu9kSg5ZsL1sJAr7hDaHz5n P8jqmXgEmLngdz3zSvMFBqJ+SrzOhp29iYawyuUf2g+wZgiOjiREgd1oY1ve3gx/kFlC GNAam9HFqNMj4JsCW0N+2UGCKnHv0Vpun9C/oCPyKvAbghXGe/NO0j1XN76/GM2W10CV ChDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=W4/4WGx73cmlmZfMgS5sVRgZbEW91Vkq9ibkAqHcF6o=; fh=WbyWg/NNrFqUX1z6z9yESaVA92BBgr9iRy0PdDSoDVA=; b=cdkPraiDgqEgZNEd6M7tEeP/9ksK513Z3zkykcHzsunUMpomb2LAkUSM9cMtLacJFk 0Xg5ujdWozmd/TxBD4xQ/VoxPbJZigtk4IZDosUq9piRQmAWh6d11PsHcHMnvaJMNJSB Ir5D+O4pcsbKnCzuQReu9qbm+60odLXFA1IgmmPOfmrZjWjpdeDvNrqY7l7NAzkE1/58 gGv03ZoeHquRt7jWAhoQxPWuqRXqPvgKu7mYikRUseWEZDk18b7pQayIPYDzCcNsWEWX q0vOT4zuzYcfLVvytHsxFcaRed/s56+DgeEmyVMcYCu2q4J1CiewdkiSZJUlST7CKb99 d1Zg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Usk4aQxL; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id ffacd0b85a97d-378956d8ff4si4038478f8f.1027.2024.09.11.03.00.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 03:00:39 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Usk4aQxL; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7290C8923F; Wed, 11 Sep 2024 11:59:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="Usk4aQxL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4861389245; Wed, 11 Sep 2024 11:59:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) (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 20DD28924F for ; Wed, 11 Sep 2024 11:58:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-42cbface8d6so22598965e9.3 for ; Wed, 11 Sep 2024 02:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048736; x=1726653536; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W4/4WGx73cmlmZfMgS5sVRgZbEW91Vkq9ibkAqHcF6o=; b=Usk4aQxLJTOj3oVGuc2lf5HWNWimhMd3sg6FySjV2Vq3G4jXOL4H1ViQxZZrT6QHI1 ygeWRUiay6f/oU2OybEBs8uCrYjObElyM388HNHcsTKP+jsJuUSLqxf28xh3D0mX+1qb e22tjLi49LL7O0a5e6JiADHhkxqbueV07HQOMLNy2F7fMhE9Hpf/Xovv4oaO9OWFOuko cqY9Pbl1qMis04gtev/vDjuH6ujUGn+DVP+qplkA50HPmiWqdz9QefZxAgiLN423eIFy g2fGgRWTbfDYcR0REgRTSDJdR/P/ncjgUISDn8z/4mDbUIutf68WsIoHvp9NE8YTP5rb 200g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048736; x=1726653536; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W4/4WGx73cmlmZfMgS5sVRgZbEW91Vkq9ibkAqHcF6o=; b=KvFYIWc9fL4s37yBoJzawfj+SuPpQ06wwARr9dEPUwuwj8PTFbQaqFVhKy1Pa0/3Xr Kgq4uEaiyka9DtbJTH4WQdNVYDaFQ5vkNtwpzwUtho7rUgfBbkWelvWRTgWYOvXG1ZyB s8QUGltwj4a7BEN9E2v2R1Ql+KezMC6h1ioXXe2nSpnxDESUfzYZ9zGObXRi9NgCEEn2 +0wYh7SHuzMTWLm4TpEE+iaUz31nguny2BVrXn9wR1KWfCxAYaGL48Hgyjv8zXtYcqvL ky5h27RpfBdPGelZcTSI/s53F2oJJ76ch8zpzuYn6ecrjcjlfD+rB6pnnlig7J+qlx0a ZsgQ== X-Gm-Message-State: AOJu0YweiEgalbNVwzrVsjUQs7N+SldfIwp29YnWIiSmmVldsUSdF8OE rBdSo6z9KmQApOQk90bztCYZ8rpXPZ0/2TGpPMsmPFv7QC67SpVJg91wiOzEGjKp92iXSawK5rk tDRgX/nQc X-Received: by 2002:a05:600c:3c88:b0:426:59fe:ac27 with SMTP id 5b1f17b1804b1-42c9f9e087amr169796675e9.26.1726048736335; Wed, 11 Sep 2024 02:58:56 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:56 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Simon Glass , Joe Hershberger , Ramon Fried , Tom Rini , Sughosh Ganu , Masahisa Kojima , Yasuharu Shibata , Marek Vasut Subject: [PATCH v4 09/15] net: wget: allow EFI boot Date: Wed, 11 Sep 2024 11:58:22 +0200 Message-Id: <365cd25d2326037ec8000d865b4389e8a373b632.1726048404.git.jerome.forissier@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean wget followed by bootefi currently fails as follows: U-Boot> wget 200000 192.168.0.30:helloworld.efi Waiting for Ethernet connection... done. HTTP/1.0 200 OK Packets received 13, Transfer Successful Bytes transferred = 12720 (31b0 hex) U-Boot> bootefi 200000 No UEFI binary known at 200000 U-Boot> Fix the problem by adding the missing efi_set_bootdev() call. Signed-off-by: Jerome Forissier Reviewed-by: Peter Robinson Reviewed-by: Ilias Apalodimas Reviewed-by: Simon Glass --- net/wget.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/wget.c b/net/wget.c index 6ebf9bca0d8..c8cce554c5e 100644 --- a/net/wget.c +++ b/net/wget.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -425,6 +426,9 @@ static void wget_handler(uchar *pkt, u16 dport, case WGET_TRANSFERRED: printf("Packets received %d, Transfer Successful\n", packets); net_set_state(wget_loop_state); + efi_set_bootdev("Net", "", image_url, + map_sysmem(image_load_addr, 0), + net_boot_file_size); break; } } From patchwork Wed Sep 11 09:58:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827387 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp711483wrc; Wed, 11 Sep 2024 03:01:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVeZ0lJjjQWFtn28fF6TbBZgk3YE/dC8HTRsIwwDoXZYvvUg4XYQu2AZCLiWwHWcPvUf5RcLw==@linaro.org X-Google-Smtp-Source: AGHT+IGSqzt9GnB7nCZiwnsmQ9tpBYDknrDOmczTD50/hZD+Xr61+C7kpiBSQ3Q7eS8So20PlcPJ X-Received: by 2002:a05:600c:314c:b0:42b:af5a:109 with SMTP id 5b1f17b1804b1-42cae76cf52mr99103315e9.24.1726048910642; Wed, 11 Sep 2024 03:01:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048910; cv=none; d=google.com; s=arc-20240605; b=IXVVDLWZ00il+mlm8gA+ARt88iBFBvfLYcuYJ0uEGuw7aFL8OTty/4NhUeKps9Udv6 r6p+IcZdUORk8vZPpPbcrBc/s3fzWpjzi2YkVxYT21Rfa3ZxCRooTMvX77fkAYlcFggJ WPAvfHyK0VaoVr6AxPCvgnXYwYBg81bIZlWq+x8LxW586NCxJWbm4Uvxi0jYGWmsYFdd ztdoflFbzUlucLV/akdQY819JIZEG5b0j7bpCtkN7YOhCxmun8lOqnD0yNnC2Q3J9mZ/ vJJYj4AqHWNHUyb16ba2cv3w74bl89HY0+8MUKrtZB4sWcNVp05kHwbm21Qml04vqPAI hQyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tCjcDCoXb5oyRDUvYeiyUQT0buhWu2O71HdCxslK+58=; fh=Eod2Vgq+6u20NMj8si0qj6e3EN9Vp1hMYkzBmyX0NSA=; b=VRimkpwVlDqWa6JJ13luUBSa+NfxP2Trmtjx6FpFO/MhLPw6lF5b6zGVu1DjIP3OOm 3Sj8y85+61JFvpa+CanaN3IH5JcaUpduRDaKDW5NAT+rMBI0kywiU9lQPxX9R7Zzt0t+ z+vIj1xtx/Kq0LdyYrEUCcD62i8HAlacMm9EPSs477xQdsL85Fo1tQm1fURXX3z9eXBS m0ZaRXrSHAHaUlVLQqUCH8UHqR+YYLFdtqSkq8A36LkoGm7dKjUVOpl6gzE4A+Ix20M7 KyF7vskeqVze8JvaCfTa9rH7iwv6EwvhxF3pEngF+3pB7VZ70+KOhr0TfUxP+e+Rt2AA w4Cw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rt4or0Pp; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ffacd0b85a97d-37895603314si3845630f8f.176.2024.09.11.03.01.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 03:01:50 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rt4or0Pp; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78C2B89261; Wed, 11 Sep 2024 11:59:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="rt4or0Pp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 09FFF8925D; Wed, 11 Sep 2024 11:59:07 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) (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 E70A38925C for ; Wed, 11 Sep 2024 11:58:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-42cbc22e1c4so21054425e9.2 for ; Wed, 11 Sep 2024 02:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048737; x=1726653537; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tCjcDCoXb5oyRDUvYeiyUQT0buhWu2O71HdCxslK+58=; b=rt4or0PplYDrUm1HISIoR2tu4Bf2qfmnFcgfaqb5SF8G9dnm1s9wBCIC57AnWo99b3 UtB85AFf8b/1V0R2xpkMnTc0xgxKDIO2G08ZYoyHneJ1dealwSWTunxH47wMfbujZWrg +UiIiOMD+z2iuF8IKLNRULnltwdsRE+TOuMJ7N5f83ivGiGp595Db5qp9wA3ZKIChTYp /lsQkNVhnQ/t0nlYdz4S0MrWbPK6JvuVHZKjfpBFui4139HQZKiOghhmHIIoQhPtnEyw VVuEO2/QwOs4BH30/ktcU746gFRq/42MJPW74MTE/bnOqUeIhjX3P9pZUiVQ5cah/y9U xrHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048737; x=1726653537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tCjcDCoXb5oyRDUvYeiyUQT0buhWu2O71HdCxslK+58=; b=k1SQCFpi3rcVoWQVd3FdxhhGwpkGfWEQvWyxPi/Ttt6Z70DM03KLHnOL3Kwu586FCA QYXF1ZQmookmzHmDScF0UTO3hFo/IeglUcjxim1imoIw8bBLhgcrOiD3gCq2+Na/H9jg sirli+X40xb6zhJlhLh9HGJ1tmUXcKEqCPZ2ctPGhDETFadtH3TSmd4OaJJleUIvVoJQ 8Y7JYi3k9VI71S7qjEXiMU37MeAFL2laXMN/7IOapU/IoOl8co3iNzqm6bSs/xWQmuef 5N2uS44WUNeRuLk9apQwbTCDZaJKBYJMlE6Lm5hXWwWwfQLsB5IUePqlFyE29UgmNrSP JxKQ== X-Gm-Message-State: AOJu0YyyIMqUUI2yS8dxOPKMLA6rD1sBC0MKngHaG2aUgQJTFlhvTh8T wscX9u8iYPRh7Jv+MxpZttzAzZ9E3gQTLeHbw8Fav7HuBiqEax0WB8CTo8Dnggkwf6eYUoEbkvT +Y4sVfA== X-Received: by 2002:a05:600c:468e:b0:425:5ec3:570b with SMTP id 5b1f17b1804b1-42cae79d262mr85779975e9.35.1726048737147; Wed, 11 Sep 2024 02:58:57 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:56 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Fabio Estevam , Joe Hershberger , Ramon Fried , Tom Rini , Ye Li Subject: [PATCH v4 10/15] net: fec_mxc_init(): do not ignore return status of fec_open() Date: Wed, 11 Sep 2024 11:58:23 +0200 Message-Id: <2089194cf5b0895958a74cb52dafdcbf1de7c739.1726048404.git.jerome.forissier@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean The fec_mxc_init() function currently always returns 0. This does not allow the callers to detect when for instance the PHY initialization failed due to the port being unconnected. Fix that by returning the status of fec_open(). Signed-off-by: Jerome Forissier Reviewed-by: Fabio Estevam Reviewed-by: Peter Robinson Reviewed-by: Ilias Apalodimas --- drivers/net/fec_mxc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 0a0d92bc2cd..2dc1364beec 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -615,8 +615,7 @@ static int fecmxc_init(struct udevice *dev) if (fec->xcv_type != SEVENWIRE) miiphy_restart_aneg(dev); #endif - fec_open(dev); - return 0; + return fec_open(dev); } /** From patchwork Wed Sep 11 09:58:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827382 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp710980wrc; Wed, 11 Sep 2024 03:00:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVCbrQ5iTtuAYWfVKyznjjv0hSUi+r/h6zYCCNosP+vcoETIhPtaBlv8dvZRbatvrwmoDOZZA==@linaro.org X-Google-Smtp-Source: AGHT+IEh73sKMz7MpF4uU6t1tSJVhvTwcj3jDdwPjN90394p2Uyr3I6On7cBAOtL/GBsnIDY9Rc7 X-Received: by 2002:adf:db41:0:b0:374:c324:eab5 with SMTP id ffacd0b85a97d-3788967ab6amr11333891f8f.41.1726048851676; Wed, 11 Sep 2024 03:00:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048851; cv=none; d=google.com; s=arc-20240605; b=Os4eMW1KOetE4DecG2ggewQIKLt/N3zr6z0tk6SqE2VmQqfHJeJamkOReiGcou2FCZ m4wYIURwQIsCLH7u6V61tiC1EZXh/qLW7fxtH13Nd678QsI9zNLRkSM/W9PlEuHoQY9b LiGbqahsfhbDgSqlrVhcAvmHpJ3WAR9c/sAWg73N52fdL/Hzwbv/WBBfIM3M6xF/1MKZ T2bSTXs7Fm1wM4ZR14SGJ2yWioSdxQMmSrIN2a1JDcMszlz1hnVsfosHLSmq//pRv/LY ApcHjzj4zCSo+LEfm3ZoYfTI7XqoIRILXeejtYps+Rt060ZxSUYX/q4SjEdAY8UAjK/g wI3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=47/RH3dhOQEQUdlUxl7YjuTDLYbsddTLJ33keJnBwME=; fh=LM7c3h07p3wMy4uAJrOs51A+GLdCVDgAhljQbLRjyEg=; b=HACMa9dFybeV5ambX2zhWxl7eVTXY2zpzUxqqyUQx4OU47hyLvsAZFcXQtDv+9rbWF LVgzBcP1ben+yV1sGd/yAHtqkdwhNdgcoxMwygzOdzz3TGB5/MmJX6UWvZVP+ZORsPHa tx7afAQnryB7HxQsoWHUlBL4zBRTjwD+OZ02b9Gkn1YdbdEAwcc/UoFAoY1DBvRon5Gx rEuxdJYKzYuGayi9cX6M7iAD7wdL4wNdEwb1/XznXit2DxGj+xe+DoFvU6B0lmXiJnIr 3RbG4OH2BsLDXYinn6seS+C9k/I1NM80DVcR3PmZhE2X3zJi2aF9UCDVM151FB6WuQ3P cLWg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XTX0F4r0; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ffacd0b85a97d-378956033b2si4000982f8f.197.2024.09.11.03.00.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 03:00:51 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XTX0F4r0; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E13DE89243; Wed, 11 Sep 2024 11:59:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="XTX0F4r0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AE41589243; Wed, 11 Sep 2024 11:59:04 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) (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 1097689264 for ; Wed, 11 Sep 2024 11:58:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3770320574aso4129194f8f.2 for ; Wed, 11 Sep 2024 02:58:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048738; x=1726653538; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=47/RH3dhOQEQUdlUxl7YjuTDLYbsddTLJ33keJnBwME=; b=XTX0F4r05Q3rF552qgXnlGiR2z0UCZPUyloOwlVArk86Ciuqc1heeUMi7lCgZwWwhj /J8wl78EIaE8DyZwWEKKVrGKz7O0SzeWHW3XwgtNXrsQ4Ty77sVK6ECQ1VxGfIMB/YRn goiEb8AAzR20szpyDHT2scaAyEBt+y+LbjU73o/49t1PqDWEzcHEKS2ndoCTP9Oc+GYP AnYAY5+9aExy6qWOl2nyf1uY49w6A4zolVL6eeL8kreKZDYKBCHQeiqrALq58276QSZb uo/tekuIV2n9En7TMMVBy5m/7iqOUB8ldH7bwqHjPOPNXumxngiFs1plfmGa2lHxCNWQ nJPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048738; x=1726653538; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=47/RH3dhOQEQUdlUxl7YjuTDLYbsddTLJ33keJnBwME=; b=OpURCYFvEpSgsIf8meRBFlJOApeVZP859ukSIB3dhQJ7Pz0gu9+ThTM/aWHmUPNDET Zqht48gKWYwaJJvjJKqzek+1V6WULPFEnqO6Xv1OUDDpbPBcQTZxVC+mmHVzKP/MhQgP Zj46zQ+N0XA2E99Ih5cBMPGlVAwB1d7NCEHhHbhXFwwMYKUPDao4Tw6shiwRWTHg6iTM n8gKTK3R9lTs6JFxd6CkzXzyP/VtnLcj91gmzS1L2mrfNnmoV9jhV7/EBQv2V9mxlDpS Rraa075ataAT8XY2Ezxld/8H9RfehCcGhWkI381G+mv0xpcgqjxtWRDN3nG0EEcBQzJP fSMQ== X-Gm-Message-State: AOJu0YxjnCWfGmc976O48GvPvRNU7dZowAgQ3HWljoWG4nuz5jYR8afo Szs9dEfl9JKv9bixw+G74an2mgeZVmkpEqLOTESMp+ymzuiVT61jBgdV8JoMVdET/BtkNqpcMKE ZjmtwkQ== X-Received: by 2002:a5d:46ca:0:b0:377:9867:9028 with SMTP id ffacd0b85a97d-3788967aaffmr10792979f8f.44.1726048738319; Wed, 11 Sep 2024 02:58:58 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:58 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Love Kumar Subject: [PATCH v4 11/15] test/py: net_boot: fix comment Date: Wed, 11 Sep 2024 11:58:24 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean If env__pxe_boot_test_skip is not present, it defaults to True not False. Therefore fix the comment. Signed-off-by: Jerome Forissier Reviewed-by: Peter Robinson Reviewed-by: Ilias Apalodimas --- test/py/tests/test_net_boot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/py/tests/test_net_boot.py b/test/py/tests/test_net_boot.py index 63309fe82e1..d7d74356928 100644 --- a/test/py/tests/test_net_boot.py +++ b/test/py/tests/test_net_boot.py @@ -75,7 +75,7 @@ env__net_pxe_bootable_file = { 'check_pattern': 'ERROR', } -# False or omitted if a PXE boot test should be tested. +# False if a PXE boot test should be tested. # If PXE boot testing is not possible or desired, set this variable to True. # For example: If pxe configuration file is not proper to boot env__pxe_boot_test_skip = False From patchwork Wed Sep 11 09:58:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827383 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp711108wrc; Wed, 11 Sep 2024 03:01:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVwQ/AJdO8LdkAv0JdfEYE0nyddUq+yoC8r9d2FJabFLLwBbtzDpJEL7LS3qONg6/FJSd/+Cg==@linaro.org X-Google-Smtp-Source: AGHT+IF1WEl0pSMWImT1694TWKwP04axhqxagMVJF8YpBnACDBlg59iBaF/qUbYoyf1FNMeZtVJ7 X-Received: by 2002:a5d:6a0f:0:b0:374:ca1f:e0bb with SMTP id ffacd0b85a97d-378895d571cmr11014853f8f.24.1726048865313; Wed, 11 Sep 2024 03:01:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048865; cv=none; d=google.com; s=arc-20240605; b=GONQB7VhbYEFI4rUx5eAY+onsVmNqrapWpRl0JA/5MZ3m5jtkToEZGfsX5o5/waG6R II8CbA5NTxD4n7ZuSMrRvONRgreF43YnAnkSBG7UgyiEm94N/GXdPbqOCoKAjPTeb6aP X7Rub2zSIoyOn4rYvB4yWxwllsaYFuvm3+NnfLs2uwJkb/WUlfsgk8W4w9ScZIBquisR xeoIlXki8HVK9Fvj8mdFnsHc3kOgsZi1tIUB7QRR8jy6jfVU5xT1sTVh8pH7wp6jixpG QHPVH/YhUUbhhNplrdAyyv9VUANjiyZner+BtsAQAb/wsc3iVe4p9iVEskjUjpVSQn22 Sf+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3bGIbCSvTZOUrrfzEdG3CRsey8qYbjuB8FdRv1iwMkY=; fh=iwlctCWAQxhrnz/vtqAA+S8MFeTTMJC2n5Y3F0B81C8=; b=QnF1PKTQzMzhMZ/gDyxtYlcQIndKOoCLlTFayjg5XPUDyy7eynfMChEroXGHJWgrKJ kc0a+VUyoeZc26Xu0CV2nu6vrc2kVOSPVLgoojFx6EOik54TiqlhCjhIaqW32Poq8ak3 X1elpbdOnoQrQzU0s3+PHqMkgMFEFl0AaujQxnxilYCncATZL3CZ4Zjxmapb6e7ucV1f QdyLLEao1VtqbK/+5psGgPxMiauH+eEcpOh9t9d5flc+dEQ5XrhfrvCuZQlt9QWTX1O4 DK3wFLVYzjFdcquNH4vfC9WUkcbeCiwuUBy4UH/8MOzKzwAHe81HzKwAml+4O2Mh4722 xxGQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PlLyJ0cw; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ffacd0b85a97d-378956cfab3si3929583f8f.845.2024.09.11.03.01.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 03:01:05 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PlLyJ0cw; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 617BE89256; Wed, 11 Sep 2024 11:59:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="PlLyJ0cw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1204689243; Wed, 11 Sep 2024 11:59:05 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) (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 D2CDD89270 for ; Wed, 11 Sep 2024 11:58:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-42cae6bb895so41599685e9.1 for ; Wed, 11 Sep 2024 02:58:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048739; x=1726653539; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3bGIbCSvTZOUrrfzEdG3CRsey8qYbjuB8FdRv1iwMkY=; b=PlLyJ0cw6Pe60ovfWrS4QNX+KKOBro7EKcXySdTAFeHLrSgH3yHrbEHHW+JOiDwhWm sCQ+hj0EegJx0vYvN7ePVWBUh+2I3j+iyFFio0xFyhiXVmOmMpWMNkKqalDpNuEf/ZHI 8riqQ/YlB1OcW7G8WU3svyq2tb5RZ2E5ashSEgWdHEobrnym3+1klf8obUei9IxtqkeR cbeZcKDDv7IQyxxu+M6BeZJqz4+GYegOStZNDIMJD2g/uBJBMo8a1MQ8Lu8tj8VMsjjN WMPLs7Mfygt+9yLI5s9brUbdSK3ulw1f5we1DOdP+a4frFSUNcnrhdIQVI46ZUt5M9pB OQUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048739; x=1726653539; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3bGIbCSvTZOUrrfzEdG3CRsey8qYbjuB8FdRv1iwMkY=; b=Axc2RHOoSGMm1GADbd4Ma2pZa3IbnOrDj+z0PZ4fo7wgOee+XH6hKGWmSUG5P9U2bQ hgPdZTUWYsLCNaV36wNq5673LKZW+036Cz7MptrsPD2g5MFlzJ+A9kzfU8YvDEc3GBC8 cqHJJG/VNkguIFKlrb1TpjaaCJAZxWN2bnKfy4RGlIKdZ82kEOkX7afqDF9uFaeX69Gy zm9us9aBvdGVK7EnsACjRz+mt314k+gAJc4tw0aS0t4Ao8PqCvVCkvATjnT1gnWoZTpl IEqECyQzwhv7IhKbAIF9hHBbk7SaHQjQ/eDARpyQhsel3NvP1NKdPs1Q+1xsJzUMmrkH Zb1A== X-Gm-Message-State: AOJu0Yx4baJSTeyzPcVMsmj4CMIjGrXvXHlTWxhOuCJi3JwqP+fUZET+ rO9rsycHaLqJ1n5ajc3icY4v8MhRvdcQz7JTN0oPSeVF2EXxZWYwgE5c4hqvj5RLnOviKxZ+mNZ +NE+Dyw== X-Received: by 2002:a05:600c:4592:b0:426:627e:37af with SMTP id 5b1f17b1804b1-42c9f9744cbmr131267525e9.3.1726048739085; Wed, 11 Sep 2024 02:58:59 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:58 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Heinrich Schuchardt Subject: [PATCH v4 12/15] test/py: test_efi_loader: add missing dependency on cmd_tftpboot Date: Wed, 11 Sep 2024 11:58:25 +0200 Message-Id: <6f3df763dd4e2bf01aab7b5c38f1ebcf161db6f9.1726048404.git.jerome.forissier@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean test_efi_helloworld_net() and test_efi_grub_net() depend on cmd_tftpboot so add the missing annotations. Reported-by: Tom Rini Signed-off-by: Jerome Forissier Reviewed-by: Peter Robinson Reviewed-by: Ilias Apalodimas --- test/py/tests/test_efi_loader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/py/tests/test_efi_loader.py b/test/py/tests/test_efi_loader.py index 85473a9049b..7c1e0ffa594 100644 --- a/test/py/tests/test_efi_loader.py +++ b/test/py/tests/test_efi_loader.py @@ -149,6 +149,7 @@ def fetch_tftp_file(u_boot_console, env_conf): @pytest.mark.buildconfigspec('of_control') @pytest.mark.buildconfigspec('cmd_bootefi_hello_compile') +@pytest.mark.buildconfigspec('cmd_tftpboot') def test_efi_helloworld_net(u_boot_console): """Run the helloworld.efi binary via TFTP. @@ -178,6 +179,7 @@ def test_efi_helloworld_builtin(u_boot_console): @pytest.mark.buildconfigspec('of_control') @pytest.mark.buildconfigspec('cmd_bootefi') +@pytest.mark.buildconfigspec('cmd_tftpboot') def test_efi_grub_net(u_boot_console): """Run the grub.efi binary via TFTP. From patchwork Wed Sep 11 09:58:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827384 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp711190wrc; Wed, 11 Sep 2024 03:01:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX1pEpj8JXgLLy3of6uqwdphzecbzz+oho3hpjN6Ud2YHU8qrH6JmKTefhV/Bo9IyoN9bRjCQ==@linaro.org X-Google-Smtp-Source: AGHT+IGkBrdutxTYHWNokWlOQhzKsURvCecQA0Loxb345WL+MTdDGhDs6dWh1CNUU90t6Rg6c7Yd X-Received: by 2002:adf:a199:0:b0:374:cafe:c55f with SMTP id ffacd0b85a97d-378922a6c57mr11707832f8f.20.1726048875467; Wed, 11 Sep 2024 03:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048875; cv=none; d=google.com; s=arc-20240605; b=IEA+ysU1eqaWGjZkxrdz3lgvyxykUzNDyTM+kwG7NxR/4hVyAV6TD/84+1vcCCKagW PXQdBv52gjgOp7AhmYYJNCOaRjV48FBnT5VgozHVxVskblPlO3jzQBnF9pR0S7hdhRho j1q+i/3qZ8/5UCFRsnV+E7+FtBfFErHfOpry0b+OpOpMYKzjD5rfNuOHquF+Kkq24uJA vg/DiyujPVH8Guw4yWFY2ROX0VIeEjJ4k/PeMxv4gXBLgG+1p+FHJ/06rAE8qRly0ns5 WNaMSfOjHdKMPDzGDMSwVAWAHf5UYcIp8aY9oILdmRIpYZ3wPWVyR143PqAKz+aM/aiH e7NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pVLp2Yc0TD42b4eD8h2KJ+CtamgC47vAQn8KmKi6cS4=; fh=iwlctCWAQxhrnz/vtqAA+S8MFeTTMJC2n5Y3F0B81C8=; b=LlhOges8j7uhg90quvk3dBJ/3RQnaEqFoTaPUITnEnazEYNbWnbM5FcSdxMN3XpOgm 0PAje/Ke4FtdEE5cb+OzcWn/Rr9SubHnhKhkmgW31IShZQsDWIR5h+Oj80NNFEB+WhMq QYIRqrPq5WSf7Y5Rupx4pgYJsUkPpBoroaLpxhle56RD1VSG13BRt6zxrf5nTjwfRNoq 7Nylh7tv94JEQyVi4S51Po/9Wps4iANgoZyMsp0yX+LFsciPfq8ZZRdNCGC9V+jzLD74 813TPx7dwNcSUShfy1XAKm4ohcefOCgt2MFnjrgAODG11zTwx0frPCYAa5hCnhryM3Mv 9C8A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CXxL++0o; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ffacd0b85a97d-378956cfc3dsi4091240f8f.926.2024.09.11.03.01.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 03:01:15 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CXxL++0o; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CF71889264; Wed, 11 Sep 2024 11:59:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="CXxL++0o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 29C4D89255; Wed, 11 Sep 2024 11:59:05 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) (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 B339C89257 for ; Wed, 11 Sep 2024 11:59:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-42cb57f8b41so43029375e9.0 for ; Wed, 11 Sep 2024 02:59:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048740; x=1726653540; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pVLp2Yc0TD42b4eD8h2KJ+CtamgC47vAQn8KmKi6cS4=; b=CXxL++0oZIQAivAn8XfDvDGsfEteQ4oMq38QrGsy5xRyJHzAv8HAokwhWcUasA9XtO eTsKjzP6WE7x8ezQf9vFRDkgzfFEOYTJ3Zt1hD49QzHsh11nO9+RmpI6Qka0Ru7JoE14 etUSbHyQMT1quZfL3QE+J09Aid7YN9Xe+lpvdQIYuzww+MO+dJmNqAS+vvF7wCJYcuoI bt8U3lS9amNrQ1TY5H6A2kqDfJF/vDhEgIPH66LicoVJzJF/487b4x+CnxAHk6yfhV1F osZBPaBIMYTP34xZNfgEQVCy+LwFh0K1AsqLzNiB8gXylmeWmClwsuG8+YVZPDHWfAAG 2P3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048740; x=1726653540; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pVLp2Yc0TD42b4eD8h2KJ+CtamgC47vAQn8KmKi6cS4=; b=jP/ZHWpvUM1M1a+Vp1STSm+q5TlBnGryH7E+0DXjiyVplqeoxY9vmb517WUXC0c2LA mi43KFftr9aGiADs2r80qyC6NIXH6bTI/ELo/MP0RwpJOCflP3q4CfIaSgLkSm50FtRV 5d84NygHlRR/sCpc9lyr8v75aZIOm7IZuzv/WNoPSuwOTebyoUhqpB3x6vKdAlMztThd EUuv34zY1jocER9ifXt0IlC1DnL21s7UhX+IrseQAXFwjLizkwWizEU6n++d93CLkurA jG2GWZC2l7qRZYKSFfpQhb6dRnpafYXqthhgZZ39rxtAHTkNjhIzWRC8WeSM9ApWE2+v exRg== X-Gm-Message-State: AOJu0Yyu7L9pP1MWwjONzkOK+jGoK30O8XYHq//hemzqQHSVg4gc7sgg b/fvXPotMSm8SYxcNgLWzeRnx+9RZTcHo6LcrrjWGf71oetkxETjreOspzuUk3HrmW5ZeMM5Me8 6bahJAw== X-Received: by 2002:a05:600c:4449:b0:42c:b52b:4349 with SMTP id 5b1f17b1804b1-42cb52b45a0mr105693275e9.33.1726048739901; Wed, 11 Sep 2024 02:58:59 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.58.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:58:59 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Heinrich Schuchardt Subject: [PATCH v4 13/15] test/py: test_efi_loader: add HTTP (wget) test for the EFI loader Date: Wed, 11 Sep 2024 11:58:26 +0200 Message-Id: <37d1101caa3efe11f65b8b5fc5262203cb6aa29b.1726048404.git.jerome.forissier@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean Add a test to test_efi_loader.py similar to the TFTP test but for HTTP with the wget command. Suggested-by: Tom Rini Signed-off-by: Jerome Forissier Tested-by: Tom Rini Reviewed-by: Peter Robinson --- test/py/tests/test_efi_loader.py | 62 +++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/test/py/tests/test_efi_loader.py b/test/py/tests/test_efi_loader.py index 7c1e0ffa594..5f3b448a066 100644 --- a/test/py/tests/test_efi_loader.py +++ b/test/py/tests/test_efi_loader.py @@ -45,11 +45,18 @@ env__efi_loader_helloworld_file = { 'crc32': 'c2244b26', # CRC32 check sum 'addr': 0x40400000, # load address } + +# False if the helloworld EFI over HTTP boot test should be performed. +# If HTTP boot testing is not possible or desired, set this variable to True or +# ommit it. +env__efi_helloworld_net_http_test_skip = True """ import pytest import u_boot_utils +PROTO_TFTP, PROTO_HTTP = range(0, 2) + net_set_up = False def test_efi_pre_commands(u_boot_console): @@ -110,10 +117,10 @@ def test_efi_setup_static(u_boot_console): global net_set_up net_set_up = True -def fetch_tftp_file(u_boot_console, env_conf): - """Grab an env described file via TFTP and return its address +def fetch_file(u_boot_console, env_conf, proto): + """Grab an env described file via TFTP or HTTP and return its address - A file as described by an env config is downloaded from the TFTP + A file as described by an env config is downloaded from the server. The address to that file is returned. """ if not net_set_up: @@ -128,7 +135,13 @@ def fetch_tftp_file(u_boot_console, env_conf): addr = u_boot_utils.find_ram_base(u_boot_console) fn = f['fn'] - output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) + if proto == PROTO_TFTP: + cmd = 'tftpboot' + elif proto == PROTO_HTTP: + cmd = 'wget' + else: + assert False + output = u_boot_console.run_command('%s %x %s' % (cmd, addr, fn)) expected_text = 'Bytes transferred = ' sz = f.get('size', None) if sz: @@ -147,17 +160,8 @@ def fetch_tftp_file(u_boot_console, env_conf): return addr -@pytest.mark.buildconfigspec('of_control') -@pytest.mark.buildconfigspec('cmd_bootefi_hello_compile') -@pytest.mark.buildconfigspec('cmd_tftpboot') -def test_efi_helloworld_net(u_boot_console): - """Run the helloworld.efi binary via TFTP. - - The helloworld.efi file is downloaded from the TFTP server and is executed - using the fallback device tree at $fdtcontroladdr. - """ - - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_helloworld_file') +def do_test_efi_helloworld_net(u_boot_console, proto): + addr = fetch_file(u_boot_console, 'env__efi_loader_helloworld_file', proto) output = u_boot_console.run_command('bootefi %x' % addr) expected_text = 'Hello, world' @@ -165,6 +169,32 @@ def test_efi_helloworld_net(u_boot_console): expected_text = '## Application failed' assert expected_text not in output +@pytest.mark.buildconfigspec('of_control') +@pytest.mark.buildconfigspec('cmd_bootefi_hello_compile') +@pytest.mark.buildconfigspec('cmd_tftpboot') +def test_efi_helloworld_net_tftp(u_boot_console): + """Run the helloworld.efi binary via TFTP. + + The helloworld.efi file is downloaded from the TFTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + + do_test_efi_helloworld_net(u_boot_console, PROTO_TFTP); + +@pytest.mark.buildconfigspec('of_control') +@pytest.mark.buildconfigspec('cmd_bootefi_hello_compile') +@pytest.mark.buildconfigspec('cmd_wget') +def test_efi_helloworld_net_http(u_boot_console): + """Run the helloworld.efi binary via HTTP. + + The helloworld.efi file is downloaded from the HTTP server and is executed + using the fallback device tree at $fdtcontroladdr. + """ + if u_boot_console.config.env.get('env__efi_helloworld_net_http_test_skip', True): + pytest.skip('helloworld.efi HTTP test is not enabled!') + + do_test_efi_helloworld_net(u_boot_console, PROTO_HTTP); + @pytest.mark.buildconfigspec('cmd_bootefi_hello') def test_efi_helloworld_builtin(u_boot_console): """Run the builtin helloworld.efi binary. @@ -187,7 +217,7 @@ def test_efi_grub_net(u_boot_console): executed. """ - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_grub_file') + addr = fetch_file(u_boot_console, 'env__efi_loader_grub_file', PROTO_TFTP) u_boot_console.run_command('bootefi %x' % addr, wait_for_prompt=False) From patchwork Wed Sep 11 09:58:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827385 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp711293wrc; Wed, 11 Sep 2024 03:01:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUhKa9sw6fwhlDIQGdXA8pIJ1ewluaNYVVGAmkZvHWYKzAFzB1vfbHKc3rFvZ+lBLMCNrngiQ==@linaro.org X-Google-Smtp-Source: AGHT+IEkUH2l1WUv0fI2hhJKW8ksDqBy8CFHwJu29tiKtrHQo4xcxU7MMFh+EiiWBxCjgpQhO7g4 X-Received: by 2002:a5d:6acd:0:b0:374:8f90:b78b with SMTP id ffacd0b85a97d-37889674993mr10042581f8f.44.1726048887537; Wed, 11 Sep 2024 03:01:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048887; cv=none; d=google.com; s=arc-20240605; b=NxoIFCqvBWIjY/iNZiL84xrxCTZWu5G9N4aI+eK5Z2w+pvCx4+Wo9Y0MRUpc36Su8z E5fqoE2q8v0h0Mfo4YL3oX8xNLqqhz2UaC6FhzWX9M4Oz9cQeHRnxees2Efb6B4bKAk2 vcWdek/FxlU+j53StRRzZUbZasZdf/Idj3hcorZxBkGKneU3s9e6waSlsV2M93x8nAAo S6FKK4MYXvWxFIC//SDCxUL4upjNVMuH1p8Pkvyrws7LMMp7jsmjiYgCXJuwj779ZRnP WDCfo4pannBSI1jwxGSVP3qAs140lfdr/Zplu4TF7TTUIvM5cT4O16xf0uzX+YSSK/PM ktIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7pQJ/U35Kq9qHhWWud44CyWS+0/ZT8DvHOfQHL+FlLc=; fh=CHD5nBQgwlPmwva/28UbxJgWYorO2VtxHzL2DWBTbfY=; b=GtxXZCfpX4SkRMDkeyyYBkyB0f/Evy/WL5+a+fjdMmv6uFTCPGD3o1/gZw55ISPe0/ IMb7UZoZp7jDN6pgKgRhxs3TfFiTF9VJHmNy3vX0VRHIV3L+wOETM9Yc7E+ytLfkmB3g bD6H92DwmQQv8kx0BhwMNyELlbfjOPkIHxBIVOrOEhig6kw/mJNe6UkNWE743o70hJFI 31Zonafjer2K9hZL/8dV5Kwi2p9pUa//LyrgoLdQ6cHI4oYJszYWeVwfgXCRN6xMTyIy CXJCDhPBfdaidL49d71mVI381zN+wH/OQU/mbL2jFGqSPgYdExtt917tujR5GKBct9/s Bn5A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bR9dV2KG; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ffacd0b85a97d-378956d8fd3si3941901f8f.1071.2024.09.11.03.01.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 03:01:27 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bR9dV2KG; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4C83989267; Wed, 11 Sep 2024 11:59:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="bR9dV2KG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1674289254; Wed, 11 Sep 2024 11:59:06 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) (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 97D0989274 for ; Wed, 11 Sep 2024 11:59:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-374c3eef39eso3739432f8f.0 for ; Wed, 11 Sep 2024 02:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048741; x=1726653541; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7pQJ/U35Kq9qHhWWud44CyWS+0/ZT8DvHOfQHL+FlLc=; b=bR9dV2KGQ4lXKOLBwWFNxIw9rBV/gGAzB+TrDKaFV+CGquusYjdQPyXbgvPLx2evLk /DL5p5eCd8lBAnCpgEfwKpTRu2KPyKPAeEHP1eu52fu/5ZZtyw1UtXTHxsPIKEORMV7G q96VkwsqAfJdqb5vYhRPnPFAQljU7smKi2FuusfKZ4WV/32BG6Fz+duu1mTxn9m6dh+F zJkkeCHTTC2GALUzR08tJQL9LbkLAKjLgg6uTyq8ULwPUQFO7pI4GuCvE/9V4MCVE6NR vRVRtZ3Sx1/MeSYL6tBq0kMjFWqvUZSrltKyUkLeFm5K4/IucxWp8lAWOSevnv75m2Rw 88XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048741; x=1726653541; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7pQJ/U35Kq9qHhWWud44CyWS+0/ZT8DvHOfQHL+FlLc=; b=mwUCmg/TvZgIk/et9UnzMmpXAV4vti46YQL7zSDcwo09pu+99D397nh+OxBAFMsBty UImjWi30N2jW4KUTQviuqc6wWjzRbnh4AcFryuoy6KMQ2Sb7OgUm3gixrSQy9UA+Ce4X mmKFLaNAHRhx6YP4L956BmsXjy6UxTSaw+OF+SpGJMYO5UKXfmSaPgu2AjfERC3JhHe8 T6jyQzp+xACnTPdGyMxYMbirmCE6p7t4H0sSc1+TNJtxWmcQMJmZ47EU76SbmGWgNP1O uwHvKOysspmuIu0rSRYzCKry5/4dBnvMLzSy2DOVwMdLtx4azIaPCiGm1nI55z5SrOFN cXYw== X-Gm-Message-State: AOJu0YwNcWQaIja4/niZgIw0nAe3U55yEs13HHxJ5zbceMEwrblcbi72 BkAgc+oTmDCFAnechK0wPod2jckRVVIBqW0ZL+UD0ot4xb9SmoVJS8WuDQ3q/OvPwQm8FOUwRrd zL4w+Y3bg X-Received: by 2002:a5d:634c:0:b0:374:c40d:d437 with SMTP id ffacd0b85a97d-378895c9f9fmr10620546f8f.15.1726048740811; Wed, 11 Sep 2024 02:59:00 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:59:00 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Simon Glass , Stefan Roese , Jiaxun Yang , Jagan Teki , Devarsh Thakkar , Rasmus Villemoes , Marek Vasut Subject: [PATCH v4 14/15] common: update: UPDATE_COMMON implies CMD_TFTPBOOT Date: Wed, 11 Sep 2024 11:58:27 +0200 Message-Id: <38f8f0ef516ee215f9089a6cfb687fdca180de35.1726048404.git.jerome.forissier@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean common/update.c (UPDATE_COMMON) depends on tftp_timeout_ms which is defined in cmd/tftp.c (CMD_TFTPBOOT). Therefore add the appropriate imply statement to Kconfig. Signed-off-by: Jerome Forissier Reviewed-by: Peter Robinson --- common/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/common/Kconfig b/common/Kconfig index 83c81edac20..968d4fb66a8 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -934,6 +934,7 @@ menu "Update support" config UPDATE_COMMON bool select DFU_WRITE_ALT + imply CMD_TFTPBOOT config UPDATE_TFTP bool "Auto-update using fitImage via TFTP" From patchwork Wed Sep 11 09:58:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 827386 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp711407wrc; Wed, 11 Sep 2024 03:01:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXZ1Ab45uqPnRr2EGGo0sl2rI7GrCLzaPRccl0HX/1DUt1gPFykcK3ezC3Wlhh3P7S7hHbevw==@linaro.org X-Google-Smtp-Source: AGHT+IE0Pwv2SwFnBLuIiZIGTLl33OmEkWcNSiwLyJsZynI2d1pdYDy2KCcLNj4O1xtnRJF+4B+d X-Received: by 2002:a05:600c:3843:b0:428:1ce0:4dfd with SMTP id 5b1f17b1804b1-42ccd361045mr20520705e9.34.1726048898697; Wed, 11 Sep 2024 03:01:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726048898; cv=none; d=google.com; s=arc-20240605; b=Ij4ylmobu9uZ1y9sE99rdKA3ncsTzLhHBF3MrZJZUIxW09qxEB94IYJiEFZN7wfOvp P2987Wjx9pMhN8oaj4Msycd9/kmUsdQmhiTa+JCAjkLSCrsR2HZdTjdze4koKKjOJcHO tSKw80LYa11/yfjZ4WQ8s4RZgATl83n3JS/Mcwb8i8kLy3dDyll1/qNxx3Zs9aY1X6+m aG3kg8omdzQ+clrNP3rVTzXkBChkhphEOqL2jTj7nt1Hl3E0P8j+55g/e73/wmvEy5tW oBAbjgE36YDRIMUJIFFV8Wxih3Uvnb1ZdIBUd8w0j4RocOjmRVOTCoDp5IRfGrw+NWBT Zaxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KD8m8Uo52xIaPv0WvJ+JiahFSS4fy+418GyTfuuiFzI=; fh=EZ29A0qeBo0UZ5FPuLwh6Z1Q3mIM3Zr5LCdfaFLun14=; b=WvuwST1OheTdgKy/8anSrlpt52vu3ioUKESUaPOcToTQWGKVCb5MiPfNvhFvIsUzOc rE4umDlO6MLdWntqU9CT+J4L4RCzSWKV+I4DvSEWkvvpUb0gq85RmSwZQJBrFDsz8DMI Hr0o49E+Doact/v1zHatWygUFF4fuOJ28X9S51YLHFxpaeG4cmwjh34tDtkv+jSiTfwg 0fKQ8J5wIYSsvJ/uZoaoSzQvPJ/on+iWLjz6eNDPcZMtAGLQQeI0Zabx1wVudkO1J7xf 5wJ5o6I3Ydu/32+Pf6EW0Z3I8bxY0xlPDNo5yh+rG0wYJ6QuEzJOC0a8Y0l865yJEPgM STmw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ec+TPGJT; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id ffacd0b85a97d-3789569948fsi3963366f8f.304.2024.09.11.03.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 03:01:38 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ec+TPGJT; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BEA9E8927E; Wed, 11 Sep 2024 11:59:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="Ec+TPGJT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E63F78926B; Wed, 11 Sep 2024 11:59:06 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) (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 8CC8189246 for ; Wed, 11 Sep 2024 11:59:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-42cc8782869so12439605e9.2 for ; Wed, 11 Sep 2024 02:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726048742; x=1726653542; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KD8m8Uo52xIaPv0WvJ+JiahFSS4fy+418GyTfuuiFzI=; b=Ec+TPGJTRIMTCo0LBdWBqTFm2jqiPThnq/zaXI2h+I/Tyj1U5BO09JozRFWSpVnVyV ZG4yWzrPCXWk8j76oPs7c/MkVRM6KDPMM9ObkvSrkcufz5j/jaSRYuImUGiz0u+BTD/M EcwVU5+Wfd2rYJm1G6S+4BOk6TAxs2F8COOutH4UlDuyrS/yTkiwDpWGNFMRJpyOfg5v cFPggRCX+RRZCumXRdouHFy7C8QOjgLwEo1vMYZ9ZflMRdC2SIw793mdRzaQ+NDnyxo4 YXePJns6JZaT64/AveOcv1EzfCWomgO0qaiwCCfO8fagi5i+y5GsK/1dTSZORi0A81zy vvqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726048742; x=1726653542; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KD8m8Uo52xIaPv0WvJ+JiahFSS4fy+418GyTfuuiFzI=; b=j9/q6r/q7gWsuXjvcxzaa9FYz49y8nLwscUg/f/6CN6q+dz28s7Id/hQ2r7eSLiCn9 VSUjrbN3PAHODg4p9mo7EPXZQBkKAM8z0zshM0mOxEjZKDeA1xrh8TLebFW1fkf23/4D zBuVyr8vap3OGIGMH1KqUAio5fZXhrnEjIB1cMtmQUmsLP+I6KnCF+XDZ/eq42XvW9Jl w41OCooJGp1H5TypHP6uEJ9HWCmQLWvbf8awrNX5kKBZfnKEiz/B28v3ERGRYkxpu8Z5 +68Ivewyn7Yf/j4YuZwyDxAMuKr+pQqaDadgGeUZSbXJkK6ZCstzkfGgkIbebvXQX5Ap JZtA== X-Gm-Message-State: AOJu0Ywfe8tyskCDQuotzGlWNHAPyNxDvPi4+nVsfCOvayNp+/LJUoUK m9/is0JKs5+O8QurfmEMrOacirUPSGDtHCWap6BdZcV3bKptWuf4ZgTEcoPi53zf+84ApcZhYTh aYVFeLQ2h X-Received: by 2002:a05:600c:35d1:b0:42c:b5f1:44ff with SMTP id 5b1f17b1804b1-42ccd35b3bcmr19533395e9.24.1726048741788; Wed, 11 Sep 2024 02:59:01 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:7d92:535d:cd3d:335b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649bafsm11300507f8f.7.2024.09.11.02.59.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 02:59:01 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Simon Glass , Mattijs Korpershoek , Heinrich Schuchardt , AKASHI Takahiro , Michal Simek , Francis Laniel , Anand Moon Subject: [PATCH v4 15/15] cmd: pxe: CMD_PXE implies CMD_TFTPBOOT Date: Wed, 11 Sep 2024 11:58:28 +0200 Message-Id: <16ee83d900089302331807d5b1e4f24468b1c9ad.1726048404.git.jerome.forissier@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean cmd/pxe.c (CMD_PXE) calls do_get_tftp() (CMD_TFTPBOOT) therefore add an "imply" to cmd/Kconfig. Signed-off-by: Jerome Forissier Reviewed-by: Peter Robinson --- cmd/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index 43f78a5aeb1..83c82818bf4 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2099,6 +2099,7 @@ config CMD_ETHSW config CMD_PXE bool "pxe" select PXE_UTILS + imply CMD_TFTPBOOT help Boot image via network using PXE protocol