From patchwork Fri Aug 30 10:16:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823963 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp700758wrs; Fri, 30 Aug 2024 03:17:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWpCGaLwBl5NAB8ghT5uSn4Xbx8LxWlMW0hmFS4hYwiXy8MqqYzFTfLZv8uxeaoJT5wdxGbAQ==@linaro.org X-Google-Smtp-Source: AGHT+IFYEczUaWPki+1kWU44FYpziVOzpbKuEhUDmK17UhPkznVRDx+bWg3tleTeE1yjNa9pb3aD X-Received: by 2002:adf:f346:0:b0:368:3f13:22fe with SMTP id ffacd0b85a97d-374a9598b6amr1103075f8f.23.1725013058861; Fri, 30 Aug 2024 03:17:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013058; cv=none; d=google.com; s=arc-20240605; b=GKnKmkaShTdCj41M1IH5K39FM0HM9aRyjUtiUXAwS9tvXd+XzHbb4D+6pGirMx/BHC OOsSYGbei4TV80rO8cghuI+oJbu87PLs+dR7H4Xf3fi6MjqgsYZxxQCRi2bpL6aFAGqh YA04mMr+53SPl/dOxfOECdPb+0yrv8BeENBKQUUTgaIdSyZ4P+l+k69CXh4ZzwcuOFm1 tBiv/df5lGtjolZv9LM6gelrpRCcaGvGAzQSn3RDM4qdFAjvbS8pyP75WAiEG2jUsAhK DoPmwAPAvakGn0eWnZETnTjDI3lXoqepp+zhrmJb97kWHNZ5W/qMRWdJbNGhFO81kik+ Emvw== 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=S0RBhVoNaek3QAHuKn+tz7pK4sQBIpxCfm7RmAzgMQ8=; fh=eDZQStCr7QM0v5EyQOWkbrllOW6Qai20rcA/vvByphE=; b=li8rWD24Fq5OvQrZb7C8xQk/+wbJTSYF0jM9TogoP7dy+p4ysyNNux7WB1VaUi28gl GZvEQKp7vbImNAcy7bqNuzgBkQ8TMthR/sYB8K3rHf6zKwU518amPwL408BP946BbR/u PHYGE5GsLer+5jbU6E5h6U3ttdchJ8spYN1RY28mNpLK118rTRj06rX1jjKnjxtwQvAP iJBzT4fF5qazXUb04+362qYbQXQXpp+L5UTNJbTAkmshdXWYCHh01v8Z703aAEWIZUl2 E1zSyCiDE8y8KV35Z63caVdp8Afm/qhBNrBaFeaYfnZMeAZp34bs4Jwlc0XeLfBK4G6z GK8g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aMhzyAwn; 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 4fb4d7f45d1cf-5c226c7216dsi2682049a12.76.2024.08.30.03.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:38 -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=aMhzyAwn; 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 3921F8897B; Fri, 30 Aug 2024 12:17:26 +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="aMhzyAwn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 68CFE8817C; Fri, 30 Aug 2024 12:17:24 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (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 812B988744 for ; Fri, 30 Aug 2024 12:17:22 +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-x42e.google.com with SMTP id ffacd0b85a97d-371a92d8c90so961236f8f.3 for ; Fri, 30 Aug 2024 03:17:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013042; x=1725617842; 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=S0RBhVoNaek3QAHuKn+tz7pK4sQBIpxCfm7RmAzgMQ8=; b=aMhzyAwnvmFH2/aanplGhMTeSxuP+JiNbyk6VY2I9XWSRC23nZSmRrYVDC2oc/z4Cg O75hoNh8uszWx+hzLsg1XP+WCSYrwiB4xnhZEcfAlaEofSGm4w9QpZQWCglcsRafmEx2 9yUFJwXMeczR+GzqO5zrOZeE8AphkIpSf002mOX1eBd/Ld0YtkoVePcu7bdbBfE46riG gJwl4NZrCy2OLxK8alwk1veOidOYgctXaHJf4WGEZUBwCcUNmyLJ7+0tsiW2onsp6QZI M8znomz/E6uAPaXD2J7HcshAxI4tb/0W8a7apG7dKkwZz62F+PaisgP2BwBl9hXjOyzq EyJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013042; x=1725617842; 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=S0RBhVoNaek3QAHuKn+tz7pK4sQBIpxCfm7RmAzgMQ8=; b=pf4+8w2f9hiJSjEE75w2hV4G1WVJhuKJuBTKxx5P2GMdlJWm/Y7k73YONxO9GPGDp+ cu6l0j9rLurJVLWuocHSsaDwdRcv4h6FOQ6mMPQPfKmE1X/hLSXioAxI3Vt4wxNsJdOR ZkkNoUPfITvbiXRFCVQw8W9Jqagil5CZ7kEkjrnTlpIzM4960QJTGN5l+DWCwNFndjaC EuqIHOKoWiz6yPt3nc6bJN+Wx293V5OLREPuqC0gg450TIFXO4c1nDt+Sni85Q+CuSko h7VG3uP55I+ILx3l28Z+LM0kU4nLx2jPRuf0aWx+NkKjU0VcFqVLv8yFSVCMESDFLPYh JdaQ== X-Gm-Message-State: AOJu0YwfBL6OkTur13QJjPXxc4/cxkH71GbaQNI8JHCT7Nx0JlJJdUPz dCn8N3yzz3U1UcPNsmeg7vGsTowhJs2QS6i/ZtTc38AI5wHQVURY/St1pxNRDEXQ0G3WyYRnI3Y wAk3Ylw== X-Received: by 2002:a5d:6605:0:b0:374:959a:780a with SMTP id ffacd0b85a97d-374a9677377mr969434f8f.57.1725013041684; Fri, 30 Aug 2024 03:17:21 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:21 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Simon Glass , Heinrich Schuchardt , Rasmus Villemoes , Andrew Davis , Sumit Garg , Bryan Brattlof , Jesse Taube , "Leon M. Busch-George" Subject: [PATCH v2 01/16] Makefile: detect HOST_ARCH properly when CROSS_COMPILE is multi-word Date: Fri, 30 Aug 2024 12:16:44 +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 When CROSS_COMPILE contains multiple words, HOST_ARCH is not properly detected and the sandbox build fail. It typically happens when using ccache. For example: $ make sandbox_defconfig $ make CROSS_COMPILE="ccache x86_64-linux-gnu-" \ CC="ccache x86_64-linux-gnu-gcc" [...] In file included from boot/bootmeth_efi.c:16: include/efi_default_filename.h:33:2: error: #error Unsupported UEFI architecture 33 | #error Unsupported UEFI architecture | ^~~~~ A similar error occurs when the build is done via buildman and ~/.buildman contains: [toolchain-wrapper] wrapper = ccache Fix the issue by considering only the last word in $(CROSS_COMPILE). Signed-off-by: Jerome Forissier Reviewed-by: Peter Robinson Reviewed-by: Ilias Apalodimas --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f90e48f58a..dc7bdd7942 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ include include/host_arch.h ifeq ("", "$(CROSS_COMPILE)") MK_ARCH="${shell uname -m}" else - MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^[[:space:]]*\([^\/]*\/\)*\([^-]*\)-[^[:space:]]*/\2/p'}" + MK_ARCH="${shell echo ${lastword $(CROSS_COMPILE)} | sed -n 's/^[[:space:]]*\([^\/]*\/\)*\([^-]*\)-[^[:space:]]*/\2/p'}" endif unexport HOST_ARCH ifeq ("x86_64", $(MK_ARCH)) From patchwork Fri Aug 30 10:16:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823964 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp700813wrs; Fri, 30 Aug 2024 03:17:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXljPZbeXVab1PaTgXWwd121G6wpWIqoSetn2HIn6qP86gjOAvHcKoHMeMQXaGEMtf6efjWiQ==@linaro.org X-Google-Smtp-Source: AGHT+IHF2HDXayYmfbMuQtgCyNPxz6PT3Ln91C0DiXx+OHhjjDxM+oK/Qlh+H5j3v9SfD4l09Qvo X-Received: by 2002:a05:6512:b2a:b0:52e:fa5f:b6b1 with SMTP id 2adb3069b0e04-53546bcb1d4mr827680e87.60.1725013069800; Fri, 30 Aug 2024 03:17:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013069; cv=none; d=google.com; s=arc-20240605; b=crE/Yhw01kUK6WuLZqtIAmzlolrAiQzhtTCWrypiUHwTvEl30cketuQ78PhsAuSKVm kvzBtQi1YHGayAW6nj6AYiM7Wrr2M7CQWZeMBIOHAzRtsBGgiPSnZBUSy2gL31Qj3mix uJN7/Oj9dxU/aRgYPE/qwlX+3zg6mxLYQq9kWAhu2JMDeiaNjPTulHTdikdz8v5ADSWj msZFVexH0fGbyCed795evw1g2/TOSjxUwvF/v+cVyXA3FoOQRdhoPmU7C4+Sl9WEsnEB PVPNCsgX+cB3eXw+QFyDBTqAMF4T2lqPmWYmBOD7slXYvnaM9f/FAu3Rsj5V6DWu0vac i8Nw== 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=UDVq0/Zv29LqDL7LOh8KnfZqyATDPB5jWwnrFqrVuyw=; fh=VCASqRBh3Wt8k5Tbv0KuGn5fWi/qebVQ8C+cOHVYZcQ=; b=J/X83Ll1+aRJqRKupwWSXh1a/CohnMA2Bblw9FrHsP8XAfhH0k6HYZIbhUf3oXyak4 xkjjJVgcS1JGte59Q8/B3aoYYP2rKKSc4kZ0n0xxpmzljbc6e4ByBkLKIyTgLHGyecBI PSxxw6Bbm5pex1gTys59um3HbTvzmUET2Q+5GW+Iu1NqNikyrn/Qvz3zjgDGx+rRyVoq Ydq1wj489z6YxEi+dvDLbPW3ev49qyMt4vAwhhEKl0vUNTQSrcz/wanggWI5AccrhfYp sQHbcfBbkFfs3NwcQtvM1upy1qSJRWZFRABg0ChmbCVzu5DpvAXpVxwJWuR+TArq5aVM +deg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MrTskOai; 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 a640c23a62f3a-a89891fcbbfsi275196366b.1050.2024.08.30.03.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:49 -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=MrTskOai; 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 95BFD889FD; Fri, 30 Aug 2024 12:17:28 +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="MrTskOai"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BC6A5888CC; Fri, 30 Aug 2024 12:17:25 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) (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 A77A0887F3 for ; Fri, 30 Aug 2024 12:17:23 +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-x42b.google.com with SMTP id ffacd0b85a97d-374b686d62dso129414f8f.1 for ; Fri, 30 Aug 2024 03:17:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013043; x=1725617843; 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=UDVq0/Zv29LqDL7LOh8KnfZqyATDPB5jWwnrFqrVuyw=; b=MrTskOaijQxftI9n8H26fhnCTHZxQ/s4fq+CEydRfo4dCyUkv1vHA/DVII9GMsgat7 ramTlFelyja9dsbjajQYEFYUVO1245WBT0TBHt+QdExLemKFUkMufGC/xKkqUj2MUCCH 4JJLMRevS3u3SOQkqeXR+FyHLRePuIBYD1qvuICy/sMkFjsnQFnjDVlj6wyAyR6hp9Xa LLfr5m8Kz5j8of3H2wPp+CcgMSJGuZCY45N2TyfhJl3b6ZznX1TkdPlV14vKVKNygCfr cZPHttj5jaqvFIWrzhrdyZO6DBWpCQ7Vr7mLXiC76jpXzQuss0MMhod9qrfmxzP6kuLQ O86A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013043; x=1725617843; 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=UDVq0/Zv29LqDL7LOh8KnfZqyATDPB5jWwnrFqrVuyw=; b=oEu9dF/uDzI3fC3rt4PHREcd3atOjveDpflM7hYXR4DMvGVAVyXpt5WaMvUzp8lxhm t0Ys1WO4sc+dWGDgFqkE+I+/GGqV4xSmEEifnBOa+W12zyXI9YWag9a5yAQX6xbMOHWa yX6kienVHxstr3+yud70eGA+kuS8YZEkgOC4B5bOSzqan3ZAdpo820Mc1t5Pj5U4BQuv 2flj5ba6zh1q1cxViUvmxXOLuXZpR/nN5EsXgK4HKBqxPbiggnGbEXbdR+qWzC/Yj6Hy 5kDRFXF/acghk9YpcVVJ+BWOHq+Q06eJt4Kc+on+UVtY39Ro7cFMa5MWDqBYUen6158J dCYA== X-Gm-Message-State: AOJu0YzVZVz8wh1gPdNOCwVfsposXK2VAwHwjOnxiC81XGJQiAfczcjy U/jrIsAV+t2jR4D61d78wlNkU15a9MgEX66Ut4ZdsEwg5qEhGNaVsND6cWAl5WIvDKBOYyexD72 7PJm6aQ== X-Received: by 2002:adf:f84d:0:b0:374:b9d7:5120 with SMTP id ffacd0b85a97d-374b9d756a9mr49427f8f.23.1725013042598; Fri, 30 Aug 2024 03:17:22 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:22 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Simon Glass , Tom Rini , Andrejs Cainikovs Subject: [PATCH v2 02/16] buildman/toolchain.py: set CROSS_COMPILE only if self.cross is set Date: Fri, 30 Aug 2024 12:16:45 +0200 Message-Id: <655de02f937e3ea3a8f5306ef510d817bee8065b.1725012294.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 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 +In file included from boot/bootmeth_efi.c:16: +include/efi_default_filename.h:20:15: error: operator '==' has no left operand + 20 | #if HOST_ARCH == HOST_ARCH_X86_64 + | ^~ [...] Signed-off-by: Jerome Forissier Reviewed-by: Peter Robinson --- tools/buildman/toolchain.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 324ad0e082..ff987a9eea 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -201,10 +201,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) env[b'PATH'] = tools.to_bytes(self.path) + b':' + env[b'PATH'] From patchwork Fri Aug 30 10:16:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823965 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp700888wrs; Fri, 30 Aug 2024 03:18:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWHWV5pvm1WUguvKmN6elTRB1js4+IsbCMWgueB4F/SlRZvLP/y2lfZFRjIEAxet1w2S8qmQA==@linaro.org X-Google-Smtp-Source: AGHT+IHLhSyJ3ziY9lCGO0c14LWb7uwIzsO1KxZAD5xekOkCQaFfYuDXzKXBFrPoRd/rMcFwjj5E X-Received: by 2002:a17:907:8692:b0:a7a:9447:3e8c with SMTP id a640c23a62f3a-a897f78218emr354673366b.3.1725013080496; Fri, 30 Aug 2024 03:18:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013080; cv=none; d=google.com; s=arc-20240605; b=fStdXzpTdzldteAKHvwzXjiMU+30Vze1rrtUW1lwRkhi69kuoCadtzAxJw7klhZ/vi 3UHHyfaQ3qDZWFMOvy7ZmIiI3m8ih1yGbv6al/eWYYhZYMObbsY524bYD7lo3tYE0OWp gPXBa52VBQSLBFLhdrozoWkVBpfCBNtmriWEck/xA9B44CZC+2UXbIWj1TE9rAEUnG2l ZmzH9nJY5OkondXifpTWL4hHYI/mWbhMl341Af4v2tJeGtVpIy3WYiUl3UwF92Mqd6ro niLnOTr4A1niaOVY2vqmLKJfxKLCwkNQlZPfqifcIevI3SziRawTZGdJ5rnixUEMNZCt NvOw== 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=fp96vph0u3LjTjUbSViPrH+ii0sG4RJ3x6MobPU/VNY=; fh=slYz+UywTUfWLwNOPkfX9QDtFYdM/Qn6XR9LiPzRPRg=; b=hvGW2OGGDSO+HoHSNUZEeqEQLFQcwBaAYExqDNs35Ix9Ls7aUBiZKLALEdogDyXQk8 LnfMVwHv6w6QIbeW6u/wqFq4zE43RQuRtP3+nbT4SaPIoZ7Q8MxRU+o5TgrEufFOtIQh tcvpTDjoHxgO2qqe/3NSS0ewNRdj8y8HVhN7RnvJsXMaMN1AVUfvBrT/+bcmFLxlVHaL ojQ1v5a1Bxxnc/obvQZ5ZCgUQ8wjktzEoXu9976dk5WfugtSjZYiJwDfcoWgxjHViGIL t2gGQ5KTPuNdYZBAMF/OlX0B/zQzBu5TP67zSkn+nkZ/jToRmfvBroZO/Y9sfphZgSpf 1Mog==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aSjsyKmm; 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 a640c23a62f3a-a8988f4076csi292902266b.120.2024.08.30.03.18.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:18:00 -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=aSjsyKmm; 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 F308488A58; Fri, 30 Aug 2024 12:17:28 +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="aSjsyKmm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3CEC1889C9; Fri, 30 Aug 2024 12:17:27 +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, T_SCC_BODY_TEXT_LINE 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 0C46088744 for ; Fri, 30 Aug 2024 12:17:25 +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-42bb6d3e260so14392875e9.1 for ; Fri, 30 Aug 2024 03:17:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013044; x=1725617844; 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=fp96vph0u3LjTjUbSViPrH+ii0sG4RJ3x6MobPU/VNY=; b=aSjsyKmmEQCzO2ltFXjc8xjdPUyAjjp1ARUk1znbg9wUX51kCCmNOFJ4l4GNWRGHIR d42Sxauz8qJrOqzCId+B4oowa/giVMI2dX5kCfjAAd6nTNJwcxgV1zmrJEnvd9y4jOjp gqjZYEi2O8jMfxVbnDXr3WnvHZwsTTVl+EEn1tzU1efWomAkCiIXrdqUsGBZKRkvF+nZ 7s4/FtQjjdGifsfiR+1qTIoO7EWnfYDcfPmDH1p+vfs21CRvTrQYDdnRDEhdeSJmmVuL +4fdcQo7CbUdidqPg9qC/Smtp1TWOwvp17+4wDDJ0Qw7Z5/swxjqm1iCgq5av36Ihs0I VuFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013044; x=1725617844; 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=fp96vph0u3LjTjUbSViPrH+ii0sG4RJ3x6MobPU/VNY=; b=jvAT5vfs8tW7u5A2joGNDGc7KO34idPmQ3fnsjjCVrtkVIoBaGZP7EKr8T7rG6C9Eb WhAvj2s4SXBTULpNt/A840LT0WvrtSbyepXIlgAyPh+q9KeiGdljiXaYehKV6t0jIzo9 Itq0vesD1CH67JiGDqD5KS/8/nCbs5Vysmz9oOOYUcBLHV8ZGNY89q6a4vqDHx46wfr+ PTBQx5m3QBE8ZNwKHt9sjuq3cWUKUd9xtrR7Oesmm3Urahy2BmwRDj1eY5nHKJl5TCLT Jsb0G+HN09vFtTp+pFWr9hcbg4NEv5A8qpl9JkCz5fV2ly0YNt1QQE+SXhr/lN6wA6Oq sV6A== X-Gm-Message-State: AOJu0Yx8dUnPduqDsugYcvBHRqvfQ+qi9zu07nzHWD0lM88n5km6Xf51 BMyvoMBnfP5Uqv13FJScYykJaZZE32UbHVs83/hH47hKpFL7m8qQSxsx+ZQeCXDAdYtuYSvYzpJ yhcf6xA== X-Received: by 2002:adf:e787:0:b0:371:6fba:d555 with SMTP id ffacd0b85a97d-3749b546e9cmr4070692f8f.18.1725013044234; Fri, 30 Aug 2024 03:17:24 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:24 -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 v2 03/16] flash: prefix error codes with FL_ Date: Fri, 30 Aug 2024 12:16:46 +0200 Message-Id: <22c43e47bd1eeccd277cba0781d6ac8218cea6bc.1725012294.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 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 616842e62f..d324aa6ac1 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 334518a4bc..ab5d2ebff6 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 24ddc8bee7..a64e51a9b5 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 c26615821c..e5c8df750b 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 a7826e81c1..e50502824a 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 60babe8a80..32bc65e7b6 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 Fri Aug 30 10:16:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823966 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp700942wrs; Fri, 30 Aug 2024 03:18:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU1kiC2s87XIvWE3Nc3pcFkhdPRCsvoG/Re6h97SQ2C2+C/KlgjVvMlupuFf3fs1eq5W/3Glw==@linaro.org X-Google-Smtp-Source: AGHT+IEhW/na5ccJMYPqDRQTLN0wwRCASw7PCJ/yn5nuDscpohrmp81SE5j6Vq94mEXVX321UPzV X-Received: by 2002:a2e:5159:0:b0:2f3:d00f:24ea with SMTP id 38308e7fff4ca-2f61e0567e2mr10567021fa.21.1725013092048; Fri, 30 Aug 2024 03:18:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013092; cv=none; d=google.com; s=arc-20240605; b=IsTU9mW2CiTRx18tbt0CHbpHPybO7OPfsQcw16W40Dn56gbfLpWDBWkF5YnCa7vgjS LDGhXZVEDAGVGBmUMZQPMjc6p26olXZoeuwatXzBcyUdByG6l9Rw1Eh2E8Zz/xKqPWEQ uyPa5vFMnfecduXiv3lMthOUhjEJXaxsbs+lNjNHwrFzJ5TCXD9i0Z65iJWunQecvEbb lc4Iko+2yFqbtjeaDUWbD7/ZmH21Ik+cYBUCjjUNgvUnLswWL4/SopCKTzkm3tu14Xov WxzUGaL/EjzJatgnNongub4fIL38AOaUzlaTluyiWPeT4Kr3Ix++QNTnDZsdVWuQU4pK vX8g== 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=tiUNoYrCr+ZZxuvFzMchoswtyO8SGHXzGGprYijQCHQ=; fh=vl1KxqUGBNe9jkGYhhn7R6+0R7dDj9SH2iFdtSvOsOg=; b=Q0xqWH++mJe9MGKE4s3r1CVCWLzcRU+lGDeREK5mhSspe/7S1EzAxyKBVJxo+uagJw p+EFOI+EoLn5nRa8rHaULRr9XifWsa117O0HXww9JNk4H5tkemmeVM1F5z9v6zWfduX8 CarvBdhvuQuh+NOKrbySeduggIXgcLFZtv41D5ymBTWCuamUJudpGloDBxEqjYrXp5lV FBqvUGGgVk3VR5xhjyMrNjibBYfP+PEXbX09CEdsYmVD4mznUuOFoAF+cerQJA7xAUYm 7raMZ1tw3xeIDEb+55js6ZqQHpeerduRjmljRY+FwPqYaLFvrhIV/qYhmIotgO1moGGF y9DA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I80dp5rA; 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 4fb4d7f45d1cf-5c226cff148si2691910a12.383.2024.08.30.03.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:18:12 -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=I80dp5rA; 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 7117188AA7; Fri, 30 Aug 2024 12:17:32 +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="I80dp5rA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4734D88908; Fri, 30 Aug 2024 12:17:31 +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, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) (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 B05A188A24 for ; Fri, 30 Aug 2024 12:17:28 +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-x429.google.com with SMTP id ffacd0b85a97d-37496a92188so1119029f8f.0 for ; Fri, 30 Aug 2024 03:17:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013048; x=1725617848; 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=tiUNoYrCr+ZZxuvFzMchoswtyO8SGHXzGGprYijQCHQ=; b=I80dp5rAUYBhloi0JiT07IzspN5fSxu8JSalZ54DDGduO4DFnhD4JrzoLPmTinIUoG n7fWMqSPAsEGotjvaXGOsoFSBRUHEQ1CBD0x69OHqZ/7xFGRfbK64rY6U4M1tw3HOhZT rOeTMCQY1TK6aT80MM7FY5hZ0ovVxN0EQVi4DD5PK2F1R1i+paf5vbPRW4EIKgYP7OG1 arBBmU5KvovKoejnLIaZiTRzjA6lnmCSJHHG08qEjAy1p1L3KVDEbfRC2p1Zfm985j4v hHJtTHiugshfiD2hYcUJuErl0PzlfCzDnY+aVEDMjcI24aK936HRrfmTwYpSwU7YDVaa twHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013048; x=1725617848; 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=tiUNoYrCr+ZZxuvFzMchoswtyO8SGHXzGGprYijQCHQ=; b=m6B0uzsnUaNCo9tVkH0N2gQ6OpgElNUPJ6HuBgqtu9brSzivjURX1sGG+aJbPqZITb 16WgW67kkKSdAAeDLfEQ0d26NT4WnxrsUOcqC9SNmdLbIxSFYr3K7HuLkiiwGeaXTtAA ZrtqIG60npJEXwf3rSNEcl8UCU/IWw3YK5prNDWTULxC5IDX1OtFT89z5rs6ohRM/Hnd riY377vzv6mR5bDJn5g8qW1Flb21WBZpsLCS79t6qinsYldB3OjNT3yIY/ivog2qdvoq DoX9T3bNcrdBprQ40tgZaYjvdQjAxWRuzdFTGdYEGS/uRbQWsW8qSDg6I2YXGlMyeFB2 Ecrw== X-Gm-Message-State: AOJu0Yyn0O9QWv3SFeFIfMRL9tc7BPFCF9nJoPyOG1YdHhiJJonMpLrU PrXGLV5lyv31IGu+gPio1/2dqGFVRowmOjYQGaBR9gC8GtHdRAFhOPMTfcysMPcEmZgLXlC5jiL YbQHks44O X-Received: by 2002:a05:6000:511:b0:367:4d9d:56a5 with SMTP id ffacd0b85a97d-374a9652e5dmr1090094f8f.44.1725013047866; Fri, 30 Aug 2024 03:17:27 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:27 -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 , Marcin Jabrzyk Subject: [PATCH v2 04/16] at91: rename mem_init() to at91_mem_init() Date: Fri, 30 Aug 2024 12:16:47 +0200 Message-Id: <0dcd2648427f4f51d7342b61c22709240932b17a.1725012294.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 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 --- 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 683e539b1b..8fec346c1e 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 cde1700a28..0d1233cd10 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 62a7df8a19..7bfbadf048 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 3bd94d0889..af486e977e 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 afc0c0520e..6f9abcbb12 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 e5688c6cf1..f52b9a9773 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 36995a927c..cb3cd7ac9a 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 c775d593e5..15cbd0daa6 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 986da01639..6f0d578abf 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 c8a8eb4982..d104736fa7 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 54cc3c4d90..f98322fb54 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 f2e1242fcb..28079a8151 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 09ca16ca88..f9112fc532 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 1f8b85f061..0bdc6adbdc 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 64282ae9dc..37750137ad 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 fb3ec48f9c..db9ba88188 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 7d73d1f2b3..cd27fc1cc3 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 946fbc3f22..e9e4bc348c 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 bda12a9770..3764ab48ab 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 Fri Aug 30 10:16:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823967 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701003wrs; Fri, 30 Aug 2024 03:18:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX3DHd4qQ2+9Zwq4POo/xtUxKVlv6EStd0rcNQRvNLZoIfDJeqFKfreeK7nEuJSmm9i3QCj8g==@linaro.org X-Google-Smtp-Source: AGHT+IGP2sFNsOghXj54Nx7gZHiZq2TT0StScfX/vWgdA6w4T/yR7tecem6GKu/DgYkh7I7sg7is X-Received: by 2002:a17:907:9407:b0:a86:96b3:86be with SMTP id a640c23a62f3a-a89a3826268mr96806566b.63.1725013103873; Fri, 30 Aug 2024 03:18:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013103; cv=none; d=google.com; s=arc-20240605; b=Yu2Y3rTb+96W3Svs/9I7uaTwHTMVA0BXxa15P4s9n1/5fLKQNNGGdKsVRATfGLeXwm 34etPZUxdG5TeHy7lJ2S8ybaWa9esREG7unoojlr8OlJj2QgEdW+G8B7hG4jmugNZh5+ EtM6mdm46D97jvq9eB9gAYK5iJmfTHpfA9BEOdCuslS2o8utVNsiwFLN/a6XtLEkruK1 xLK/kAhANi4/b++UAdoKOy/QngEhPVlOE8fr9W+VHQn0nFi8sJecz9xw90oJTJrgOR8C z+OAoSjtUu4ixGnbkfU9wlRuciZC79wlgzcEIii5ZKqDa3waydI7OjVfEFdC9w6JfBkQ UC/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=/iiygZqhsa2/rcZegQdrTNzQtquA4zWX6yxDfOnJ/8o=; fh=0K4K44fQHqw6k1022Md2ulakJYB69+wgpp45D92YdEc=; b=FaX4nCiwe37ALRemH1OE0G73LWNfKK4ST3RxW/4sud9EmngXQQOqO3IdqceOfkiWIl YRZhYfmEKlQkD/qZBXyl2lxhO2B7WiNfL7BX/oInXp7/d58KKgSJRHToPp/hDAI8zTF4 oPAtQD6tDgaaJSAulT2jR7eixZ5RFxTE5bMi/Y7keUX0+PZaec9ZJeejiOYgrbFobvjo yRnm9p3miR6I4OjrAtmjqAN9X17AFtDwUPYVj8VQFdfMyESAEaXJLUz1WsePeOw9fsxP RvZVzPkGHlOTXjMCCD6X8eRoxa7F2SnIRzsEzfu6GOLp2DYO6xxWvLUrGHs3qSHCCwyU p9+w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bV0M8e+5; 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 a640c23a62f3a-a89891696d6si284256166b.567.2024.08.30.03.18.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:18:23 -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=bV0M8e+5; 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 C7CD288ABF; Fri, 30 Aug 2024 12:17:32 +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="bV0M8e+5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 97F9888A7F; Fri, 30 Aug 2024 12:17:31 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) (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 AA8E0889C3 for ; Fri, 30 Aug 2024 12:17:29 +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-x332.google.com with SMTP id 5b1f17b1804b1-42bbbff40bbso3999895e9.2 for ; Fri, 30 Aug 2024 03:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013049; x=1725617849; 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=/iiygZqhsa2/rcZegQdrTNzQtquA4zWX6yxDfOnJ/8o=; b=bV0M8e+5tRmFIiiHDOdpfJ7Uubmt8po/m+GWxo5vPYT2uDYNnD/FS3z8oNguwSQlWI Fbj8Y6kVDV9prYovsFbu5/L2teg66Y3QX3a/D/DxgWWXAvqgEJ9mB15/x+Kkgct3CXB1 J7uSfdL2ZtJYIXIu86Lsl+jYw2ddnnf8LHSMa5FJ8zneL6wOZ1kQNboF7k56s/xie5fY zUPLk+LjWbfxZTgtAjVYfNGCP6T0Yu1aRESYIVJclsFWN0z8EhWTH19NzuYnX9mClUFy TQ0Hqt9iXfy5OE4THuXwXA1stavzr16+3VwISxPe8/bhGPZCiOs5aJerhVt7my8yn5Sh 6FQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013049; x=1725617849; 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=/iiygZqhsa2/rcZegQdrTNzQtquA4zWX6yxDfOnJ/8o=; b=v30YQRA5Pc6gdPAQ7MdMm3oT20be6KVYr9cHLCJdch1RKgd5rv3M3JVuUkfvFz5snS 8Q1Uc2ZMGypa8zqIZwC9aqas9K6VaCHKjCWfi8xPASC10BnvJXFV3UOeo9a6mmgppbDz gbJF+PwUvznuWJWXgIeV6HLr6f3tq+EUxXHoPBaKjlZ/FY4azAc2vT29SprVC8D/S5jz oNDisUzsyyjZs8U+gHOIWvpmzMzJChpfIyQ3baEIzDzkvsVrdMHZ7avvZwdQM+A1fePo 9Bh/eYoT1vHX9QV6gtzDzKaQDyFO45JdBsQ0AGsEZerlGN71dFetlduO5tjEyUT3mqTD t22Q== X-Gm-Message-State: AOJu0YwR9qCuQ9nMw/ciVc6MDg3+KdYJRRQw634pMETyNvEd6J+trOAF oLPYpGBzjfB+WItRtDQ6vncTrNA8L+2RUU31pZC3IJqKCH3oKMo3e5mHjXjDv1xVJJKXCop8krz eb7rg4w== X-Received: by 2002:a05:600c:35cf:b0:428:1799:35e3 with SMTP id 5b1f17b1804b1-42bbb216871mr14436215e9.21.1725013048768; Fri, 30 Aug 2024 03:17:28 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:28 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini Subject: [PATCH v2 05/16] arm: omap2: add missing #include Date: Fri, 30 Aug 2024 12:16:48 +0200 Message-Id: <880f3e793afdc93023e8c05bfe3ac9a7afd1a0a1.1725012294.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 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 7348e92cab..1e30a06361 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 Fri Aug 30 10:16:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823968 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701066wrs; Fri, 30 Aug 2024 03:18:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV+M3rYr4AaRgMDbY9dSy24kXajWzaw7meg+U/+R7OQTFsPBus3xlXfOHyyDE0HxFCa57BF/g==@linaro.org X-Google-Smtp-Source: AGHT+IF6Fi5QeVg2GgXNcQkBXqfHSb7Iiqp5qS2z4qT9XpoNgznPJPcffpF0sNW3bx4Fzw2e782M X-Received: by 2002:a05:6402:274c:b0:5c0:a70a:5d09 with SMTP id 4fb4d7f45d1cf-5c21ed52ce8mr6012258a12.17.1725013114711; Fri, 30 Aug 2024 03:18:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013114; cv=none; d=google.com; s=arc-20240605; b=L6Bwuh3xD/nAQWoWPoPtB6uQC10+yGnJbmNXY8xs+M9iGJ8jjjMDDaZpjUA6LTDOF6 V2XPN4yu1LIm326roiGN4aswjJtVG016mrRhE2ANgQjn7E+RMpcQ1Lr9/P36BsO9qxAN 4YMIVI5ZBaUXv35XjAZrKUTpXjbdHl7ArpOnotY35soZh5mQuBkA/hF8ZTv9CiF4D8vn 9eoo3A32IsLDAf0j2PfdYrlVml4R9EPhjM7ZxzwOqGrSk4s/N9Aogm/xUIMDw/vlJqgJ RqpdumKUHXyWCIfAoEOTxLrH5wKnpSAjZPMUinifFO+AyA+0JRry6ZE9nAGGrykMlQmR 9bjQ== 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=EAWQNNp42XhJox51dg3EuFbQ+uZpOhCWpk6e9v5Bwts=; fh=EAnZL4IFRrLi/kZZl+bxs1QDWyO5W9ePvI/a8qBrx+4=; b=lh3qWQiVGgV/64kGHJ33JEEzrgH5IiwhJay4Nxbg2FJJkCWmNiWYHwp+7EOqSKuEPv 13lp1o2GtbZMnffFas7/Ox+O3hK1U0smK960ADEqz+amEwQXywRhMeBxTj55ftdO69P0 U2CHX0nCCHNwvOJjAFAM0OJsUopGvPoepq3bNEzj0jVdiu3JGvrq8EEGd6PU7Ti6sJ98 om71b02AOIuifG+aLOway4hAtTJc72/hVpAkiHwipsHtEunmxXtPbXqHOu4XNwpJmmtT /KeQMY1Ssgq9HHQaTDwAVsq2oxfhKg8J60vGZXkVdCPjtS5pejdmN2loxRVodxAOAnKf FkRQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tRkpNmX+; 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 4fb4d7f45d1cf-5c22a0635dbsi2107564a12.504.2024.08.30.03.18.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:18:34 -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=tRkpNmX+; 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 2C0D488A2E; Fri, 30 Aug 2024 12:17:36 +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="tRkpNmX+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B19788AB9; Fri, 30 Aug 2024 12:17:32 +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, T_SCC_BODY_TEXT_LINE 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 917B6889D1 for ; Fri, 30 Aug 2024 12:17:30 +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-37198a6da58so1302845f8f.0 for ; Fri, 30 Aug 2024 03:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013050; x=1725617850; 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=EAWQNNp42XhJox51dg3EuFbQ+uZpOhCWpk6e9v5Bwts=; b=tRkpNmX+GDxA69/MXLJWvCS1Zq8NaI8zC0gSQwMIeyrWxRnCHSKwoAvWX3eFcWBwVg vhNW/hvMxyp6ClUaPaciJPsoJrIEPEaOWMFDkrTEwKhqo8RXg29izfcYi5Jj1b+yglq4 jkBoi5sw4rZsMSCrQ0CN20jlJbSgmD06qjefd/4nWKencnnbk11fYbksHCe2hFiCFj6F 8h/iIXR43N1sZQgOz0JZREnt+St8QCMEGWBIaDYk2T8wbQ68yck1vYQ5SSy4rSoSCXOw AaqJf7LjxYpIqDxmkTAm5fz1Uk7KM26F0x/e1P7udc9D/RNb6NaVR9lZ0vqzRpRzpVA3 eNpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013050; x=1725617850; 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=EAWQNNp42XhJox51dg3EuFbQ+uZpOhCWpk6e9v5Bwts=; b=ukL3uvum7dGVjEZPQRxphsuNT+qSvReCmuwe9zTMIr5EodWVPyrOqwR0p0Zcs2JrR0 IyCTQsiyQsTh19JIryEQCbF52O5FNS/eETHfQV2tMsYEb44hNUB8gkGe3JcFyZXF5NZL EppeqlyGYk6ZaH0PMG/Ha/uy/L+8NheTFc/Ua6e59U/2qwaWv/BxzzoB/tVFJrqfWxMP qG5UCqIQ28xXKz2RYozAgcg9/1zILl69/KIYUl/1z/Y1WZ390ACSk845+aaDzKWJs79h /AEfgyqKcHQBLNozUWuvKR/EA0KdKp6mtQKUCsSjJjgtNajVSma30/08SZzn3yk70JxE lZRg== X-Gm-Message-State: AOJu0YyWiOJJCENYpyNH982Gd879LIaz6zbrfpW46RmPUhxFEXMAxFwB tKOS+Bu+f+K5LyRwQPtX4rrMS482b8Uj41GXQs3D3hhwn1WmrddZ7lxcEkm9x+PK3UFeyc8wlnN 6IqkPrw== X-Received: by 2002:adf:fd0e:0:b0:371:8c0b:4818 with SMTP id ffacd0b85a97d-3749b58afd6mr4477505f8f.63.1725013049729; Fri, 30 Aug 2024 03:17:29 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:29 -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 v2 06/16] net: fm: call dtsec_init_phy() only when it is defined Date: Fri, 30 Aug 2024 12:16:49 +0200 Message-Id: <7d3aba410bc30a42540d0a18d668bf1895337b2c.1725012294.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 dtsec_init_phy() is defined only with MII so add the proper conditional in the caller code. Signed-off-by: Jerome Forissier Reviewed-by: Peter Robinson --- drivers/net/fm/eth.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index 19f3f0fef0..22025b6a27 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 (fm_eth->type == FM_ETH_1G_E) - dtsec_init_phy(fm_eth); + if ((IS_ENABLED(CONFIG_MII) || IS_ENABLED(CONFIG_CMD_MII)) && + !IS_ENABLED(CONFIG_BITBANGMII)) { + if (fm_eth->type == FM_ETH_1G_E) + dtsec_init_phy(fm_eth); + } #ifdef CONFIG_PHYLIB #ifdef CONFIG_DM_MDIO From patchwork Fri Aug 30 10:16:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823971 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701244wrs; Fri, 30 Aug 2024 03:19:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVjCJ5AsbOeAUskMv+8ZfqxDq2+7pGcW4qcwcWJ8Il5Ug25g8VBXTFlE3u4Qvnou1P9qicg2w==@linaro.org X-Google-Smtp-Source: AGHT+IHVR3BOVx4s5bBE+WeIYA1IFtQb9v3+V0yb/mtzDcFEUpjNvk9wdx8UMqIxRMXvZY6XDi6s X-Received: by 2002:a17:907:2d8e:b0:a86:a178:42da with SMTP id a640c23a62f3a-a897f84d7fcmr432298466b.21.1725013145918; Fri, 30 Aug 2024 03:19:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013145; cv=none; d=google.com; s=arc-20240605; b=G+hlPPZP/aTGs3PkeaFy8PAPAI6aLKZv+lRSnJWHeupA2yHInciczxi8hzbX3lh3as Kdh+yliVdlUL+d9iDOwCBH+sZ6QGvSKUh/WQ3MihdCVaEfDInaWuq1XdyOcYJJU3PSf8 s5OL41Gg8v2GhdXv+4EZ3yWFqQ/Tn4tDX4PLTFJ7FsKziwG+xND900eSjz803GFa34B4 OT7lYTKBX+bnWM6zQr3fcX/k0nBWaxeh4/Pm3fCH9NRDjBkGW9gK8Uhd7qmJbHXy485X DaQdcLkFhb5CPl8HcDgN2mmz86tadV1dyEHzaPu7F4wpnAQU0pOIggDhsfnmQYPvmhgL y3hQ== 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=3o66Wp/cgY/BOAgJXuexd8LFm/1I5mfAo5SsoYZAPUE=; fh=yd0u+VQx5vYxqZfg7vvFkaP5jOiS+Ih6ZISin+39enw=; b=MbdvoQqHCS0ECOlt0keSWwd35SWOTngxiKtumcrS5ihEwYNl7DVOFdLjIEeYsCnWJS luoWRBH5OiuEF4epDbHDuIrsVhUCqAGK7IiQtbkqTqJgY2+jo7eK2uCj9Jnay5Gn/Oby z0hZfR4dH7AEtOkd0WgvFrnvw5sdeF+JZCjl9jIyidy1drf5hrr/zk13sHr7ERtL4VxK 1hrmbVWtIszAFE+98P6eqP8J2sdHSySwJ2ueNe3KIm/mzReBxVmHOMZO5E7ZAKP7gx/D jxXI990fwsyZrD6tJtOYk75A4xEYC+s6J+Eb28LjpTh99EYov2QZIZqHgrL3QO444huk PWdw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pNYtvCQu; 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 a640c23a62f3a-a8988f410f2si255600766b.61.2024.08.30.03.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:19:05 -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=pNYtvCQu; 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 441CA88A92; Fri, 30 Aug 2024 12:17:40 +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="pNYtvCQu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 41B8C889F8; Fri, 30 Aug 2024 12:17:36 +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, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) (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 1BA07889C3 for ; Fri, 30 Aug 2024 12:17:32 +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-x32e.google.com with SMTP id 5b1f17b1804b1-42bbc70caa4so3523175e9.0 for ; Fri, 30 Aug 2024 03:17:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013051; x=1725617851; 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=3o66Wp/cgY/BOAgJXuexd8LFm/1I5mfAo5SsoYZAPUE=; b=pNYtvCQuQwmfI+AVbHP5r7GYs3WQshTk5uHRWBvoEos153D4ojlrbd1+3ee5GP2Zsx //ZXqiUoJ61Kk0ZuKEB4bRDLYg9y6ws23Vz2bR3uxfP8UE1CLgnOkv5YdtGcqJNXEXCH SVN2rddcNcD0XEcjFm0VSPIS1xa8kEQb1k+K/+debRs6QlbP+9mE5rBa9TWF1hHMNmnF UealmR8JtemeqO82aSVNYVjzvw8WEZxWqftFxqp68oMDOwcdM9SrDRiwNfUi++uCnZAI iIXPKaMsLJG0GacE+DCU9IVvrRDYOHOzjgHGR2+xZpurOGE4k5Ug4HnbKwAo9a/5QQjq BkfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013051; x=1725617851; 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=3o66Wp/cgY/BOAgJXuexd8LFm/1I5mfAo5SsoYZAPUE=; b=TGteUdxnh0C2lLfL3KGTRF3wSaUGaESQ41dRRxLBAYO67WH+ZNkf2j9XkL1Dj0nPVk RZCegzCOgkBynvXu1lGXAUmdEtjaAhga3Gcl7JGBF/oY0yHrHklLnUTd7UkxDJdcUyYu d0pAAWzmyQZ5y/F+q26QGqDviYYDzwIewyyVeRRzQ7m0zMsCgvFc5wFR4tFdkmFAODhH axWfP6Jlqnx1bPHjKlMml5jAKTtC9MR6+xdxNjWQaSdww3iiU3cPh6ilVXyF59HylwcV XsbvYEwBgQiiGa4QHE5zHrep+zRwjpdOmIU9PY8omySmMirmHK8LzFOhshzVhDhIh0hC /LOA== X-Gm-Message-State: AOJu0YzNvgfynRWMPZb2MU8yNLJ06fJ6Z/6vJ7Tp4kr7GzSA0NZzaEvd +EBkZZTVn7megjvhDq9RHBotgIopqOltLlqjsp+JNltDIjR9JSd9qXVoOD2GttzcIxxu0ODYhSq 90+2CyNSs X-Received: by 2002:a05:6000:2ac:b0:368:255e:ab13 with SMTP id ffacd0b85a97d-3749b57eb7cmr3891789f8f.50.1725013050700; Fri, 30 Aug 2024 03:17:30 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:30 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Joe Hershberger , Ramon Fried , Tom Rini , Masahisa Kojima , Simon Glass , Yasuharu Shibata , Marek Vasut Subject: [PATCH v2 07/16] net: wget: removed unused function wget_success() Date: Fri, 30 Aug 2024 12:16:50 +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 f1dd7abeff..0e4dc5159d 100644 --- a/net/wget.c +++ b/net/wget.c @@ -199,13 +199,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 Fri Aug 30 10:16:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823969 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701129wrs; Fri, 30 Aug 2024 03:18:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWAdBau7C/j0VdESClRN6uMZGD9IZOkNC8Bvo4WxAojlJ7lH0ZGoeS462PsfbvLLGDaBtISVg==@linaro.org X-Google-Smtp-Source: AGHT+IF1LMvo5GjZ2E4XZc+Bc649DRi+2dGrgXMrbOgQtSEphIozBDL9Uu04F7r0yyL0RCnatRPv X-Received: by 2002:ac2:4c48:0:b0:52c:daa7:8975 with SMTP id 2adb3069b0e04-53546b05e2bmr1274517e87.18.1725013125451; Fri, 30 Aug 2024 03:18:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013125; cv=none; d=google.com; s=arc-20240605; b=KZ1skFilFZlnNYTYZ4+t4whcsq6Da3Oez+kxk6IHIOxY2KMX8vSfRLc4HhEUJ7LiRm j4aViuQ6BWYgaMGgpDXSJ+f4+eSCq2rRHso6+8KoFCSCmqqobDX1H2nIbWyzISxyMX+q lKjjiLc2ggM2XnCRsJ4rwLttW/8MOrko4xRFD77BW7UP9c0hQGVudWNFQjXgspXkxOXf gDbGBv4aBPEjKa1r/kR1c51Tn0ozQQqgGOd1cOZFw0LUV/nB5TJDH9Iu4yipQny6NC5l V5N8be3m8IQ4uEUk+B/f2Ji/6muy6qtLMIAKL85MeCJuVkqvt0TcQqxbV4h9fjcG06p4 q9Qw== 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=0PXek1QiSaTXGzLPU5w83EgSlCJRe9KxUW7m9xRW8TU=; fh=2bTnpxFKbuwh4yifGqJmYZD+qhJxJ5LAdXhObaN8uaA=; b=hGdS/C936d7KB4XVmkXrthAuQVvbfKK/bdWYhSeZKU0XKd70WaPtQ9CZtvmT07uyho hfFp9gmk08PhBsKAHxnTqhga46g2W5Ne1tHeHxdY6fhzETEEkfWdH9tmTVXOm53H98/o WBTw6rdguDtaTOtcp8v+Xyml8g+50unnH6vUxQfetRIMvQO6gsuuKCjOlnWgnMCqsjl4 We5khArLclew87HzWHMm45O9uhKElqY+UX6ppns5ntrMForofLY3xDwu5iIwfEGmtRC0 obuA43DJukTS0R9K54mT3AMRtJf36Lnwl+tcFVTRndhkAfYql5kPOja034d7Pl5+IQV8 E/AA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yoLgV9by; 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 a640c23a62f3a-a89891c54a7si281106366b.731.2024.08.30.03.18.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:18:45 -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=yoLgV9by; 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 852ED88A5B; Fri, 30 Aug 2024 12:17:36 +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="yoLgV9by"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4AD3C889E2; Fri, 30 Aug 2024 12:17:35 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) (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 C1D5A88A5B for ; Fri, 30 Aug 2024 12:17:32 +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-x32d.google.com with SMTP id 5b1f17b1804b1-42bbd0a40faso3156985e9.1 for ; Fri, 30 Aug 2024 03:17:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013052; x=1725617852; 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=0PXek1QiSaTXGzLPU5w83EgSlCJRe9KxUW7m9xRW8TU=; b=yoLgV9by+fz7o8S0gwpkDkhNzOcoSxflbvyc5jRpq1TJCwt77ai1V6fKJLZPbgMBN7 M4FWpH7C0K/orUuVBe0WhKsXXKTDiqDhYg0zK0Sfr4VT/yTLiTrH/KlQmgTLkZDoH3y/ ooAjMo1QYqN/dHnQQLyrOLBY/+ZxZ2GRrlzt0mNzPO0JNxi68oWj16BzvgulgKCV3sfW 3VOajXsjm0utr3lUEJ8Lib9t2LYuLyXZGPlVYddVAnlE8hg1R0Jb44hDjLO29W3EJPch dDMlT1ZohOsERdIzjx2+VfIvRwmdjWaSevbXV/AmuaVmfVhHTDEiaV3EVPkM3YezNz6c 9Y9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013052; x=1725617852; 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=0PXek1QiSaTXGzLPU5w83EgSlCJRe9KxUW7m9xRW8TU=; b=lTGMictGhgnL8tBWG5dgmV1IyaKhqd58EDgbA/2Wnpsz8VKDcxLoTmVaiqhBNgEirl 5C9hl88x3LcfHh/x60Ogte8tQIvb6fiUKPGgUXh34NjG6U1ejNZhfcSrxhakllY9TbBd ZD78+1uAjPClmFw1GykqiPz/BC6GEPX70VkJt+uWy3M1ezT1Q8Xd+Va6vrdT8sietzm7 vIPVcyv1Z39zqUyNNZKkZdVh9b09PS034azoCbEga67/nIHKJcRXiLXzRxWgHip3JBUh VhjkLFRf0PaW+WGKUpM0vHm3YlEAOFlVXx2Nv3d9N1YXrvxP4UpdDxdh0dmq49Wn8rZZ u+Ow== X-Gm-Message-State: AOJu0YybH540ZtC071EFsg8h1GzJNpSuk6pHnq8JpJbxwOidA/2xcyC7 wsTlKV5lvaolhBvXzH84m6Ssq7jkGdE64v0cyHIIx+3NxLPPMXXQethsIx9q/e1WAS8HG18IAGD j/0eNUQ== X-Received: by 2002:a05:600c:3b8e:b0:42b:a9d7:93 with SMTP id 5b1f17b1804b1-42bb032c82cmr48383755e9.28.1725013052109; Fri, 30 Aug 2024 03:17:32 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:31 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Joe Hershberger , Ramon Fried , Tom Rini , Marek Vasut , Nicolas Frattaroli Subject: [PATCH v2 08/16] net: phy: ncsi: depend on NET Date: Fri, 30 Aug 2024 12:16:51 +0200 Message-Id: <280b503a9ddb304e0161bde467639f936f8efe94.1725012294.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 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 73064b2af6..a9efc50981 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 Fri Aug 30 10:16:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823970 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701197wrs; Fri, 30 Aug 2024 03:18:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvxm4VRIvI1Si/Dl5tVTHIxJiigzPNznX68L7H5DqA/HxyKGzvZ/mOTlyoc3U9M2yZQ0e9DA==@linaro.org X-Google-Smtp-Source: AGHT+IE9zaksSusAyH2zq0Z+Rzdjm7YL5t1JiOctNWrEoUe8giWKKES8rwIbK/6fWl8SROLVT86x X-Received: by 2002:a05:6512:3089:b0:533:324a:9df6 with SMTP id 2adb3069b0e04-53546b5043cmr1618380e87.29.1725013136012; Fri, 30 Aug 2024 03:18:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013135; cv=none; d=google.com; s=arc-20240605; b=IUvl58nZVvIBLx3oKdBgZm2dZ/VS4STzSUC+p/CPoZ+XgkWBpQGJ6SFG8ZUcD8OLNB ATG2UQxslRmGJDYlZowVuzWAR5U3NOspDFMwMwORDt4lNW6JupTTKuFCRo8zP7ibGkJ2 eVhV5BHEPmAs4cdeFeJdsmcYBaYBZlsXg3VeMLPqA7CucPidZCtcCSnFMJiTaOXvCuTC rZI7ajP4GMbfAjsPWe1iSHHciDrqUDYKvEVJGO3nOBVL1wSLcqdjKboUcl5MFaug0pjF Z18I4a4jcGnF2CI7r0PIwpmHUxWx5rWfZ7IysKjYdlAPCOnfdHhxBUjMIrnMr5zYjIBM hrZg== 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=O2nppkZ7lk3cUfvEJ+mophz5SDTsLLYc7GttlWMGBkU=; fh=qNBwcxOcUpzar66NoucBKGk7iiLvBdKEXK1IMzEgx9Y=; b=WVjITL2UyPtkLBogm5/1/aQcxkoRCftBrj+6/+rKXWGaZYrrSze1W4s/Lx51ViMFWS m7YUDYCuo99gYAgZSg1qxbcvpyYXB2GLllp4VLsGVG25UDXlzionSxBgNPULqF0BiFur Qx9oT0H4B5QNQaB7vtRXRJ2tXQVmMh8IgQ/yhnoYf05vIT+MHcrCFKdz/6/GiSGfODt4 dD85wcN9LvwMCjuTdd/ju7rz+3FfRToqsYRWrbskqWhjOG7MpfwBJKqsVoxkWRd13DPR 4QlUNMRf1sn8n8jvPZ4B4gX/FmgDSajXCkp6/jIl+gL0sQ2vWKG/bqabMVSMyD31G1AX 942Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IwqSgkS4; 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 a640c23a62f3a-a898916c942si272627166b.634.2024.08.30.03.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:18:55 -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=IwqSgkS4; 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 DBCEF88960; Fri, 30 Aug 2024 12:17:39 +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="IwqSgkS4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1758D889E2; Fri, 30 Aug 2024 12:17:36 +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, T_SCC_BODY_TEXT_LINE autolearn=ham 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 20DB18817C for ; Fri, 30 Aug 2024 12:17:34 +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-37198a6da58so1302889f8f.0 for ; Fri, 30 Aug 2024 03:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013053; x=1725617853; 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=O2nppkZ7lk3cUfvEJ+mophz5SDTsLLYc7GttlWMGBkU=; b=IwqSgkS4xxICAyLAs5CaMotjCHXq7gk+pGItgwMiDtLV8UANjre2xM3fOcOTRNg1ac CLmQTZsZxXdjFy4+x1eVKkda2NGwgpfGuwrESsKPMqz293vpdEzicpMXXWddEJBA8ZOK yB1vjPwxA/XNRdQ1WdRAQMX3aizP+qEDBOSU3EbtJFFqlTPtGSN24sDtd2ujoHwnRvVu sdT6lry5ExI+20k4Kl6to2dR5/VgnCnYoBE61C4QdufAHYSxQDxyGBc09V64clOlk64I JXvAPA/5ewZar1P6tw3UQZgXPsHn3DQkjcORAw4sT5FIuD6PPpy+6pe7bk7S0YtZyo1E +qWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013053; x=1725617853; 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=O2nppkZ7lk3cUfvEJ+mophz5SDTsLLYc7GttlWMGBkU=; b=m9UnjECo2AhqjviyjCS+LJel9FOn6cnxW30QZEehjuzBFafHSKzYfGe0FMVDfUtwZs 8d0ybpGIK63A+lJNtZjh6YdEcQ5f/StIQOtqQheOANN8dW7jsOnxS0iu6coep7wMpuLd Tqsqnu/Ps43d0ksQ53xpGwEXlZnEUXu0INvdfx5rTmA+u4x3aqmeO5FwohyCtieu46fw USNzgIxx4VrfCGyxh1WnlayQ51P6F06hw92bOJ6opkxS0bV4folhdRLte6XwbctwMroX zN4mCNYCCVWuBztLjxrf98vjZs3WcqYnerCYLnu2fQnNpHwCuwcKHGIJEKO37z2vX9Ul QpZg== X-Gm-Message-State: AOJu0YyMlOnGiavgLcxDDBDDks7xegn/0bxNPF4v9Hb0/PLJj/P8uPmS vqEXwnR5/I+VpQGbaNpqOc/M2ICDLwKwZA4JXZJ8Ko9QiQ+FZaOXMQLuNWpzx8vkb3j5mjHw+2K S2GOeT8Jl X-Received: by 2002:adf:f74d:0:b0:36b:3395:5363 with SMTP id ffacd0b85a97d-3749b54481emr4578966f8f.16.1725013053172; Fri, 30 Aug 2024 03:17:33 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:32 -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 , Neil Armstrong , Jonas Karlman , Boon Khai Ng Subject: [PATCH v2 09/16] net: ftgmac100: depend on NET Date: Fri, 30 Aug 2024 12:16:52 +0200 Message-Id: <3db716e4924a9cf48feca84b327fd232c4336304.1725012294.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 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 69ae7c0750..3382e533f4 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -461,6 +461,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 Fri Aug 30 10:16:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823972 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701293wrs; Fri, 30 Aug 2024 03:19:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXLvjlTFvyvZPC/n9Ba1cg1n55Nj9NgfVFZNFfRkAbTPrJveW1BpwZkq/VuIR+8+R/U9DWtag==@linaro.org X-Google-Smtp-Source: AGHT+IFGHaPQNuJH6rGOtDZUr2CikcHsQwPgWrklGonVRf4ay8IHcMuZSonEOUtiwqBn81NYJ09L X-Received: by 2002:adf:f1ca:0:b0:371:8eea:24b1 with SMTP id ffacd0b85a97d-3749b58f52emr4098868f8f.59.1725013155753; Fri, 30 Aug 2024 03:19:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013155; cv=none; d=google.com; s=arc-20240605; b=d7xxZD53sPd9rfn9VbYnC5uO2DufveQZ1DdyoOZjzlJ8x8gr/VBLf9SOxqDJv1NgP+ SMkxHhtEFt5uoPXWbfrKPlJJJL6K0P5PjZre3fKD3JEzo8stsDAzkMWFRXnsewZ7cvZ1 N1dQuUU5Xk6R2mOiBxX//yRPLmNapJmvY0wFKwvRoTh8rKmfvi+Z3Xw1I2ZVOF1zhiL3 I9FgMndB2WqWUJT7DDFw6YLRjIdZVHgq57sVTpv8rRzmVUPjEakY4nkVKIaeFP83K9h3 mbZyQ7ORvBvukOvD0+8gtaE0Hrs1akgREsNEM1WiMJxI2QTKhfnuB8xUODzBGLqRfj20 +Bow== 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=7jSik1AXRrqolpr9wSVtwBcXL9ay5XVHmBbR5UW35Zw=; fh=A3KRysaEzBRR3yrAHnKD2qfyXD6hH075Kh8lQzK8IWI=; b=VgvjfdcNvxL13xZbrQrOhRR8NICNQMEBISVruErbKUeU941yPkiXBUhAIfozzfEauJ LCGh9zCj9Qq0s7kDNvXDZQ6qVAZGFWq8ccD1oa4au9PKiqEmFdZMwaAB7YzMPHY8BwM4 vC75p7voGPxA7LM5M/4MUWr/HMKhIetDf4WE/q4Jac6qst2bdLG8S3ganqN1dwP6pgch mVopErK75IEww4CYdoFRsIxkZdJXgYrWeWPe4E9HqTtkv5wNFOQ/DrINZPTewpKmO8UJ ARcphL7V37l29JrzdxKCfopTUcRHzJQaCn1jZOT66xzRY43bBrIHjCpBDlYnHLn4GoMm 7JGQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="IliDs+O/"; 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 4fb4d7f45d1cf-5c226d7b939si2610218a12.679.2024.08.30.03.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:19:15 -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="IliDs+O/"; 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 A111F88B0A; Fri, 30 Aug 2024 12:17:40 +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="IliDs+O/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 24DFC88960; Fri, 30 Aug 2024 12:17:37 +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, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) (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 EF399886E5 for ; Fri, 30 Aug 2024 12:17:34 +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-x336.google.com with SMTP id 5b1f17b1804b1-42bbe809b06so2024025e9.1 for ; Fri, 30 Aug 2024 03:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013054; x=1725617854; 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=7jSik1AXRrqolpr9wSVtwBcXL9ay5XVHmBbR5UW35Zw=; b=IliDs+O/hwY3jCg3dsDng1B00y+1mnaxe/eZ8RgAWrvdw5uwrS0z68LbckYj0OHBY/ OBYF7ymHcNfZzTre7Vr74kEVRQAcO/aNSb09v4uOdVKr5IBF943xcOfNyYOqzDBTfnhV hJ8OHAZp7coCqvUha0w6zwrsjhk4i+6X5hMTjsMZ/haTmiIlERyoSw9tff612lfOpRz5 sYkLqinJfC4kFBTbdTXghzU0OBOlSYzS0wjkLoowBj9djlBNn2Wv0tidVzo/AB3c8crT 6SDaOyZ+AvOd7IGiCWR+oZjT66COriZfpWUxd+j7XAm+By2dLYQQ2Q86jU/pPBKqKBWQ 4/Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013054; x=1725617854; 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=7jSik1AXRrqolpr9wSVtwBcXL9ay5XVHmBbR5UW35Zw=; b=vCCz2NlmG4w6nbJo5vsmDGA7sPfsx7fOqa4ZEbCZkSq0YMaSWhEfcXtLpgf9U5cZOM 6gBSpP3nwomSAVtZERc9BVcMj5457LLSYMHWyUyn19OKrvnfrYCgS99JlqyY0h4b4KB0 0lv1IVtE3nV53kjeH0rB+qvRvVa90xUDgyJMiTxPjcvJeaX5ivNQI8+kwOb5w6BqAuvv IXms3EDtJy+fCopNxuQI0iRv8neEuZy6m6jRd+Nh4HhSwgHjbR63H0yGFPO8Fewm/+El dNFeSnHMuAR1g0OkZp3tsNTZ7c/o0Ex1YUDSwOcqnuedWaNHonUAiMgGBq2SEsDWNyq/ /dUA== X-Gm-Message-State: AOJu0Yxsazgv2kieFyNaKS4PAWl5mt0G/VuAiRyio2x9DVtZwyTUM9+s w+pn8N/+csYny+SGvrag5r2U72wTbkCw2ewQEa/7IKfMTfFwxuGCtKTw08RUKJpJiY0LP+ffBJK 0gBXSNsgd X-Received: by 2002:a05:600c:1991:b0:426:5fbe:bf75 with SMTP id 5b1f17b1804b1-42bb27a9f2fmr46339875e9.23.1725013054177; Fri, 30 Aug 2024 03:17:34 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:33 -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 , Masahisa Kojima , Yasuharu Shibata , Richard Weinberger , Marek Vasut Subject: [PATCH v2 10/16] net: wget: allow EFI boot Date: Fri, 30 Aug 2024 12:16:53 +0200 Message-Id: <4d43119310d24df623ecc1d2466f03e69f0684f7.1725012294.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 0e4dc5159d..cf7681a4e7 100644 --- a/net/wget.c +++ b/net/wget.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -429,6 +430,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 Fri Aug 30 10:16:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823973 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701353wrs; Fri, 30 Aug 2024 03:19:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXa7moc1wWSLL6j9cELOJeO16dsqYexd+N+ScR+79YPPv5p9em3151mWyvkUUr5D/2VCtl/5Q==@linaro.org X-Google-Smtp-Source: AGHT+IF2Ls+la75/1kdPehAHS21iMV0HWI5zjcUr5Rs2piykscTCBzwtIXEQa2t8F/SMY9Or3o9g X-Received: by 2002:a5d:4682:0:b0:371:8bf7:d51e with SMTP id ffacd0b85a97d-3749b5448f5mr4119192f8f.25.1725013165837; Fri, 30 Aug 2024 03:19:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013165; cv=none; d=google.com; s=arc-20240605; b=OQPtSVArctSWgA6HYCDSkCGTbw6zcCyY5Zrad4rps85bITzFHDMtDjYc87wOsEyvlF KWA7TSDw6yB+VBEu3Ht7i0YHa8zzBbn7vc4OH/DZj45tzAv3wmgycwIod4zQB1YcIS8L LknKtdHTiZnRo9TzkAX7cxYHS/O88F3mEDSDEF2XB2MU3djyLwvrFnR2Gu2aQT+XA3vq u9TNwFdAg1rqPEqgN0fsf6Jal2W1KVj63TWtHJ/yxV2WYhoqW6osqDIowQRtbUoS/M5L TBUTNe5gPIixRa3bBCF4bc/G8wDUQadXyyA2bqApdSvmQf7G7AKYW0nkAqqCSg03OdFz 9pbg== 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=DITMuE/k45R030RiiaTVcnF7dWYla7fjDZtjbbdVJAY=; fh=Eod2Vgq+6u20NMj8si0qj6e3EN9Vp1hMYkzBmyX0NSA=; b=Fsz4aAzefxGPKLswicBh6wrnYTj1jIE283+rvMV6u6wfV8oHlj3E3GOVJk4EYRLcXk 6r2aNOm52iHj2a3wbnOctw2NiAcBTgQnyvyYc8/qQkjYJRSneQc6ceMs+JrkAX9Nv8A5 GXr4AmqQXSNG609zLZz6k3WsyipzWDc3qzmn1jHt4ArrKY8jvvurjnd8e7buaKBQLm7h oQpEgVP56Soyz1nG5UK82smhhYYiLKuztxHMvoYJdALzGKS6UDZ/RV2Gpdyn8Boe5gYr TdKBG0yDDC0FeQLb4G1OgQF/YM+KVYkoWsj+j4Evaxf2f4RWeN65ibksneFehEWhnwqd pUPA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jS+k2TB3; 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-42ba64045e4si28820895e9.108.2024.08.30.03.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:19:25 -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=jS+k2TB3; 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 0804D88B1F; Fri, 30 Aug 2024 12:17:41 +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="jS+k2TB3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ECEEE889C9; Fri, 30 Aug 2024 12:17:37 +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, T_SCC_BODY_TEXT_LINE autolearn=ham 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 118CE88A24 for ; Fri, 30 Aug 2024 12:17:36 +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-42bb9d719d4so7907275e9.3 for ; Fri, 30 Aug 2024 03:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013055; x=1725617855; 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=DITMuE/k45R030RiiaTVcnF7dWYla7fjDZtjbbdVJAY=; b=jS+k2TB3Sc3HRSJd+4prIHEcZXE0a4h4Jc2fMg7XQbk+oH0ZH7r7q/fiSawNFODU2i bBLE5grpwQ0Fr7HQIigPcSHy2Fq2whfefCNBtl5hzykbWxx77Em7SqtRLrk3fC3I377J mO4E2o98KOxv/evgtFfyMJ6vSxbv+a3WcdDQEuAs+2/E96JPpRGxkChL58TlxYyiL9FV QLrh6pxzfvHNDl/6DGkk7CeE539gQM74LVEBYRUKnRPwvEjhexDO0dlGZLuHy94mqTNk GiTwMyKSNr5XDUGg9G1jNil7BJWg+YzF9VXO79VBJ9WaQno5vup+qnJfB6l/jaRFagUS nFEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013055; x=1725617855; 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=DITMuE/k45R030RiiaTVcnF7dWYla7fjDZtjbbdVJAY=; b=s+jAwvDsmLTLvyL3bjOshr2OTzSxOCMHvVWJaLzbN3dMtCCmmBMFoFKWKRBuwz9cke aQtXfd5gHoKvZ+SK/nvuVxlsKevLuqIfrhhpvpoLlfzYCBSv0VGigjFunDwaGlsMpIv0 Eh3fz0D0qomkh09JjZ2HBzzrzO1vqPR9iqy9nTarUjDQeyIVJvnTv2c9DOsYuYMzt+vc EYRdtL7jvkHeYTWfLKFRKni6PSFhvEp3s6vG3LHHJZMmmBt7XfBPcnwleIfPn3eRtAzo Qu9zR/oiz3GfRzfugNbFtaV5uHvD78jq0dNCGl5+/qT6UtdFZ2E57QwqauZ4FrHoalcT LDsQ== X-Gm-Message-State: AOJu0YyIqUJfZzbI7IaVYBldLHyuGwNOQ0FEs1cDnU9QoaMzoeptrImG uSOQBHzRdFhRrs+23M8YK1a3rm54KcpMmTqG8l1v/VfTYeAUQ1PWswqp7/tyPSAHoSu436hswCI VD5Cwvbt7 X-Received: by 2002:adf:a39b:0:b0:367:8f29:f7b6 with SMTP id ffacd0b85a97d-3749b585113mr3885479f8f.51.1725013055203; Fri, 30 Aug 2024 03:17:35 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:34 -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 v2 11/16] net: fec_mxc_init(): do not ignore return status of fec_open() Date: Fri, 30 Aug 2024 12:16:54 +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 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 0a0d92bc2c..2dc1364bee 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 Fri Aug 30 10:16:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823974 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701413wrs; Fri, 30 Aug 2024 03:19:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVFDZezt1QG1lmnFIBkjwPOQMMxetKsg291Hh7Nv3ROUuVt6BEQZWIpuuO/X77Mra14FbVXtw==@linaro.org X-Google-Smtp-Source: AGHT+IGMIz6/LzbaiDy6kiu/7rgATp72mOIYgoEKC/dk5MgjMRG3qHtMCJE5vcYsaIexur50VMwM X-Received: by 2002:a05:6402:845:b0:5c2:1813:5170 with SMTP id 4fb4d7f45d1cf-5c21ed86b8emr4119083a12.23.1725013175636; Fri, 30 Aug 2024 03:19:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013175; cv=none; d=google.com; s=arc-20240605; b=jkri17kfbXHky6fB73YMvR+USKHwVRzh0ac6sT+zpG+KHdT73NlrkRVbcSc4FLwMTF nZksddfaLOzSlhuSAb55fFt5CkQr6ttdEENiGM0Jt4KCNXAy1m1W+p0uK8eV45UJO6S5 kRc5r8+S0VLEmVV9mHDVku/OdFIr84DbHMYBCPtYuu0iwvXyKqDmqFDj6B8uZBapvzNb yOQIybJu6RFHUzBHDAOiK6H9Y2GbhMOsk1r0SCnmzKqpxJcwiyuqOrp3UdPPw1GG8Sik rxYYHv6gWpGcbQI/Mem4Jc1SgVcz1F1jtD4v+rAhgE+PBW03W1l8RfrfEuIuk2ZJRNCC x0pQ== 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=CS033gC+8rAkxjatyTKS0TJpFCbJLKYLXA1JkaTUCxU=; fh=LM7c3h07p3wMy4uAJrOs51A+GLdCVDgAhljQbLRjyEg=; b=f7DcwegrFeZCicMzCHlpn44d6GRiknbF//oXQvAngsStLGuN8iLwOlbd92Gmu+rO1H ApCHoBNhFW31XgvIlSoILWeNpHu27lHf+2ef7cEwYafPbMGRgXsWXX/n7gADioQTLS6R B+E1J73Xdpl5tEUTVfBh9N/wI45X1tkgIht7Kl0zicePvyZ+donXh4jw0mijh4kCaleI 2pOKemejZc0IzhPCSWWvbgVLyiTZzLuA9jFNkXrdeeD4eOVCReAxbYknB7ymLgLUdU8Y Du90r55P5VFBL+l6MBnY8hPWm1GC5clCZpu/kij8gkgyJtkasLndsDA5/F/WiQ9x1laa WDhg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KeZ4zWPb; 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 4fb4d7f45d1cf-5c226c7cdfbsi2661558a12.154.2024.08.30.03.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:19:35 -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=KeZ4zWPb; 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 60E5C887F3; Fri, 30 Aug 2024 12:17:45 +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="KeZ4zWPb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 76361887F3; Fri, 30 Aug 2024 12:17:39 +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, T_SCC_BODY_TEXT_LINE 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 962D1886E5 for ; Fri, 30 Aug 2024 12:17:37 +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-428e3129851so14619685e9.3 for ; Fri, 30 Aug 2024 03:17:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013057; x=1725617857; 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=CS033gC+8rAkxjatyTKS0TJpFCbJLKYLXA1JkaTUCxU=; b=KeZ4zWPbbIQp0rGOQ1iUM7s6L2xKXGfoP1i15ySRjJ2No7Ez8EpwPJlRjPnzsUb8Xd BCUhCab57pfyGsP+JrjaDdyjlP7C4d9nmGBu29XqwRPItE/W9ZLoPd6HxmTUN+WLzm98 +SL/wHOxGOd5GgwOXDrNIT12wt3aVNMQVoklkYzR0zPRAHf90FNrWKpaA84Z1AIfZhsF m09+4fuoRNTmh+sTrzqU/GELEYUgpu3mwcIZH+yKs6Ch5QcypE30BAKdjhYj6qhzS1s5 qkJe7nJaxAkL5bm22FIkuC0Ex6EGI+gxCDKahs+rlQw0QEKE+ZPiUYMSbokWNRXVE4sy LKPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013057; x=1725617857; 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=CS033gC+8rAkxjatyTKS0TJpFCbJLKYLXA1JkaTUCxU=; b=gN7s5TxvxpG8M/AGObKd/OrRwx4+paFRJjHyknXS9dwx+FPirvPwm/JkNFrqhHX5kZ YNJr8j4TaZAkLlzl1uTZmAW3W7UGg+J/fXDoHbmn4rSy8rCwGBFCuJj+gzxtlI+l/2Dm upWZfoPMSunGFIYcipzh/cHEvq56arBclpcdQb4g1Wr6Uy0D41Ro+5CisIVuXy2jDVpl 52+jqevTIvoH0WWKX8U8K/otueuFrqNyaNVjgIGK119o/w0OjJ1bUz3CxRwaIE73gmWp v8CbiCZ0D600EfXkQXvt32seGhHLLt3aTlQfTe9qrWauBr13JePS8OeR35RjOrckj5ej JdCg== X-Gm-Message-State: AOJu0Yy4mdSOEA7pRFea5jTU/uaqJohinwfyEXI9PDHBvjR3ivx3QC0B 6JhCdl4iECEX7TRF57GY08XP32bu6Hm8RW9ngGY5mScbtwzCQjQq7VSI5JNvNAE3HqMi5FIMJjv /kQToos8c X-Received: by 2002:a05:600c:1389:b0:428:ea8e:b48a with SMTP id 5b1f17b1804b1-42bb01ae3b1mr46224355e9.8.1725013056751; Fri, 30 Aug 2024 03:17:36 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:36 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Love Kumar Subject: [PATCH v2 12/16] test/py: net_boot: fix comment Date: Fri, 30 Aug 2024 12:16:55 +0200 Message-Id: <1231b0ba40f8ecf807078de04597c22a29c9e312.1725012294.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 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 63309fe82e..d7d7435692 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 Fri Aug 30 10:16:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823975 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701476wrs; Fri, 30 Aug 2024 03:19:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW1lTt8EJ0PW0J+qcdWx230foz+QHJqKYM19rEyY094VOegVDqnaewUxxvj0ByX/bUy4PW41Q==@linaro.org X-Google-Smtp-Source: AGHT+IH+wV15S6z3QN4+qz4vvYjGyfdscSagQ0RAcve05IrXmH/iQKLV9Y2iAf/I5McI2kk+cbM6 X-Received: by 2002:a05:6512:baa:b0:52c:e11e:d493 with SMTP id 2adb3069b0e04-53546b452b7mr1159814e87.26.1725013185477; Fri, 30 Aug 2024 03:19:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013185; cv=none; d=google.com; s=arc-20240605; b=ky1pYLthu70iqxbZ5pQxRmyqNTcu8ZQmHgUZjQLLc+Zx+RLTEyy/nvfYOpOwQcolEW WWsASygG4Oxv9x+OWFhkjqP+xRo1+zF9BP4oIbnOux0rsgMckREoYyIEw/cfDS600VJ5 ziF+MGei9oNvFO35Zz5V/6QlG36yOr77I+/9dKHFqY6Pt0uges56vySOkZHyhRnyoi4D CYnBcy8QOmw7Tkur9hL8LEvqRRNju3XDXfspqw6JR6zU228GfDB3NDGPbW0kFRGy+J0J ErlPXOojF6a/FikK1w21hI1iYQaLKDTAP++cD6N1H8MIbu5dwUGflL0H4fcNPqryvvFX z0Hg== 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=a68050JC5rK5hfB2a9j4UawOLTypKRKojFbd/4GMZ7w=; fh=iwlctCWAQxhrnz/vtqAA+S8MFeTTMJC2n5Y3F0B81C8=; b=cWVmHZcfTy3rpn1ePJTTkLn9Pns9Kuyk1f5KjgZX1aOj4P1ctQIU+opJdk8qEaQ/S8 FzWO0Lw6ew2PO4o565l6EF+9/s0XHGMb1sH5ZzmYYrdhok9DjMmDkAIx9p8q0wO65eZS UCOcIt4HPe5TD6jhZe/BFuXEkclMnRi0f5pMa01m6NhWRRXZ/bxiylCLY5mr3Rku5awP pRuL8XYeOp3LuvR11nRSNNSQQilZ2gmtRiUmvHy5AovOjcTehVOnIGcZJ/IQwjDFru3Y pt89TO2ezqW38aBC+o43cWMt8dAspc2elMsSJYmgwjmdtoEChKv+6sxkYXfC+qLtrbLz nv8w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Uv0Sx0vg; 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 a640c23a62f3a-a898912e8b5si254116866b.317.2024.08.30.03.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:19:45 -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=Uv0Sx0vg; 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 B85D988B39; Fri, 30 Aug 2024 12:17:45 +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="Uv0Sx0vg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 617DC88B08; Fri, 30 Aug 2024 12:17:40 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) (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 7C5768817C for ; Fri, 30 Aug 2024 12:17:38 +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-x433.google.com with SMTP id ffacd0b85a97d-3730749ee7aso1123378f8f.2 for ; Fri, 30 Aug 2024 03:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013058; x=1725617858; 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=a68050JC5rK5hfB2a9j4UawOLTypKRKojFbd/4GMZ7w=; b=Uv0Sx0vgJEwPhBjz8HMAhx7BK6yoWmuRK2m3AzRVa0M8kGf5YDqYNuWLuMheIrVAR/ PyGETmUH2aJI5ZaHcFgxY5RZHE7DW10Yukp1SZxPkj4bMGW52yrrTcY3W6A6aXaAKSs8 zzF2SkO7C/42sd27QX3HCbm5ZPcbCPn7geY1O0gaZqEAQrJPB/4d93V7RA20xiE/JOUE F8OQ0rSY7GzX/V557GWw20PArup9Gnjq++xoj1yeEOY6gDBZe8Agt+FqOyhouVqm5+L3 sfsUl1jlSH0JIG6bsC4pvIufBgCm6xyV6Z+puDIh+wB5AAsoNU+smc+/rS2e1oT21eI3 OYFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013058; x=1725617858; 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=a68050JC5rK5hfB2a9j4UawOLTypKRKojFbd/4GMZ7w=; b=RqbQbu29ry0PIVehxs1+8SuXNCnXjpe3O/gwxLfT4wcjOiAtOjleZPJ/2hElSDp8Cp 5uLjWDNXwjyjEzkgxfVhHnJj/bHRbj/xwxrbtUtAlC3qPGAp89lHKFedXc7r4/QWMLqF OprKUwnttesOPXD86jWF6bnVtPpRyeLUwn67mBd1aG2k94RsE4EBbSwjwMbzhAkUUTQJ d3upl2kcY9XyoN95T2vKH9mD8b4jWmxY8VFlSMHlnsGTMDWn9Hbe9qPx/XMUEPQtrCjj PTvpNhE8S2rAAXVPqXBXCduGJYuGIFebgzAck0IucUqVy7iedGb7MtgVC/hhaAlTX8S1 416Q== X-Gm-Message-State: AOJu0YzJfhhn093IhCARIukK6SVFYYIY32VeyKdgQzdW+ypUMxg5bv6O TfLwFlBYI/W+s1P1MUvLrmivOPepWbmWPum2kD2Ye6O5feeQTU7IeJv3/CQ6RiPrNFjkANme+6M 1s3KZMcsX X-Received: by 2002:a05:6000:184a:b0:371:8486:b29 with SMTP id ffacd0b85a97d-3749b57eb87mr4472251f8f.47.1725013057720; Fri, 30 Aug 2024 03:17:37 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:37 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Heinrich Schuchardt Subject: [PATCH v2 13/16] test/py: test_efi_loader: add missing dependency on cmd_tftpboot Date: Fri, 30 Aug 2024 12:16:56 +0200 Message-Id: <6790fe75b02b4a5cdd05c30f6704c43c0c8fccc3.1725012294.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 85473a9049..7c1e0ffa59 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 Fri Aug 30 10:16:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823976 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701538wrs; Fri, 30 Aug 2024 03:19:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXS0vDLnWuiRKYabl2zB3760oacbVMPUfhIN6mT0eT/6juc7Y2nZMaFhMsqaOcFJfdMVhUkdg==@linaro.org X-Google-Smtp-Source: AGHT+IG1Nr41s7L6Z5uwLzoHhlkxSG9Hz2uKLh6ZLnEin2YZF4wI4/miIZ4PHAV7KaPovgi2tmDl X-Received: by 2002:a17:907:d5a8:b0:a7a:c106:365c with SMTP id a640c23a62f3a-a89a29f3883mr222286066b.34.1725013195671; Fri, 30 Aug 2024 03:19:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013195; cv=none; d=google.com; s=arc-20240605; b=JObL4thtPJ0NGZgvDfrSmkMMiFzYA8zG7345TNC4hzr+mBxiaNHtEC+OvieybjkkWW WOdTpfKBzU/m0c7vVS62wNRZp7sA2SUdejYRXShIHzKtqxiXqFYWnnvJWEbEH3BEPQGi dTOEWhMzLVKacZ7628yV0RlEkxqYtr6qJdiHAZRM8FtEI4Q0W22Yb/HFzDoZjoUQd9fM CFzi0/0VIhCEN42EalNsll+EEboRYYmArFzQfky3X6WUvwfObk6PtI4nhpPPDPtLFZeH winvyRSXw2ZRgmxCd9nlRPDqdxmFXwFKBlwe89JDfIACywzbBmLVGmLDwe2uLZh+ydKa uhOg== 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=QbZVlJebjDcysexzGA3hEXvcZomrRPMcMsuwByFYdbw=; fh=iwlctCWAQxhrnz/vtqAA+S8MFeTTMJC2n5Y3F0B81C8=; b=A5nlDv9IleO/RsNo29nVqmC6tskFMWo0ARdXqQngeOaPZJcTBuam+8p02e1wu2k1QI PnR+xaic1OMImCBpyqJRlVHoxWwV8GCk2Lsz+FNMi3ZvBwFWELjYq5tUZgdg+Nb0tPGR JcwxQORCJRZ9culPT7cdslvXKYKwZKHs2AT/3CXYWXTapw0iYM9QEPM+2/IUsB5oXrd3 Jsf81HN0i2EGu6+NjJYiQsRGz3Wu0VQYQn9bV4cA6cRDUFXGZs7HmnlCgtjuko52rZZB U+DiKFxvMR/didtGgI4X2jcYuw2SgB04nlrMP8uhnHSFL3S4HwlnVUmMdB9s4PyILR92 7T1A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ocq5lCr1; 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 a640c23a62f3a-a898916b6a4si268149066b.609.2024.08.30.03.19.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:19:55 -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=ocq5lCr1; 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 16B6A88B40; Fri, 30 Aug 2024 12:17:46 +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="ocq5lCr1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B3F7988B36; Fri, 30 Aug 2024 12:17:41 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) (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 B30F2886E5 for ; Fri, 30 Aug 2024 12:17:39 +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-x42d.google.com with SMTP id ffacd0b85a97d-37186c2278bso1465941f8f.1 for ; Fri, 30 Aug 2024 03:17:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013059; x=1725617859; 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=QbZVlJebjDcysexzGA3hEXvcZomrRPMcMsuwByFYdbw=; b=ocq5lCr1QanfQk96Ag1qu5F7wduOGxRnba3pCoqAavU6RNxol3rcfqTCFXRqD2bZOy vubkOSjzzap9xO28fgDOlmSwK26Ya1YZsiYn/EWuF8sInmMPPpxUGA8OH+NAEK4owPHg DajgmbnIw+13q47GJFgmsaPTxUH6nVpXi6jqm9NwJaznjUgvbsDUiYBbazVMrfPt/ogg xwOyopix0EblmnClu8cyd7e6I4mhOPFr4/F4Q4CEFpZg/ORwa4M+IquW6fcWit8CpzPo QhvUmznWMiF9cmkTtTvrH9GVxxgbT4W3FZ3Hq07cdQL3cO9T04QkeP4OXa3+hXSJfhUB w6Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013059; x=1725617859; 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=QbZVlJebjDcysexzGA3hEXvcZomrRPMcMsuwByFYdbw=; b=ebc8JRsDd0rhjRa09JTtYadEwt31CC4HS7V3uzt1J2tpCmmreNU0KR2P39BrbqBOVZ mTjw3Q8EqwYZhPplWsLJntRXasIdCGbW7s88Kcsgj+ZTteCBcqT54V5O61FjUES+uuqN pbFJhDslim112hW4VrHMdOTEV3s6dCBF6A25aXUyTSMh3BTx16Cz2pk3Yp71LQdNqh1A YVCxRj5PdZ7W4P5mwJCPLC7tfrTRmqYyBfXnW5gYCnheV4s4voTeLXioDyg26wVp+OCp ICA/5G7y+zq0neKaHUsi7diWQy4SdUoCs1rpCFnuveZ4k2jD9wc6Bh1ftvRhOCH27NsZ xOig== X-Gm-Message-State: AOJu0Yzs0DwvPKxfu7T2Y4c0Dp9NLNFpMis/iwBvl3DPpM1hWbekvcUK NA55k7X0fORYPXSLkDg2F4evSv1QKti2WX3gOJ9C6qeXkvhGmU5cUkDricFx4McT1EeCz2Pslmt 3WHYguNI0 X-Received: by 2002:a5d:668d:0:b0:36b:ea2d:fd5a with SMTP id ffacd0b85a97d-3749c22131fmr3238072f8f.22.1725013058701; Fri, 30 Aug 2024 03:17:38 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:38 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Heinrich Schuchardt Subject: [PATCH v2 14/16] test/py: test_efi_loader: add HTTP (wget) test for the EFI loader Date: Fri, 30 Aug 2024 12:16:57 +0200 Message-Id: <6f3a49531286932d01e92a55071a80f3765b1700.1725012294.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 7c1e0ffa59..5f3b448a06 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 Fri Aug 30 10:16:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823977 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701604wrs; Fri, 30 Aug 2024 03:20:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXUgXWzAd6PabR9IwHHp1jaIe2HKX5waW7m6K0GAcjn+6w3WDbgJQDss4Fx6Ty82EQcL0OiNw==@linaro.org X-Google-Smtp-Source: AGHT+IHPBYhXUeDmZMx3I7O0TaGpQnIfBAv7emTLwAzROyPAoooYCKDP26dSeYA/0KuMKbPFC2Kl X-Received: by 2002:a17:907:e92:b0:a80:7193:bd88 with SMTP id a640c23a62f3a-a897f8f78a4mr440834066b.36.1725013206973; Fri, 30 Aug 2024 03:20:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013206; cv=none; d=google.com; s=arc-20240605; b=WGRn0ED9CWfxt4TNQvxUt5aQKTAzGata3EO0pgc8Mwrxf6DkhUqziBwy1SSRegWKCu hMtmgY3TC17FL51YE2kFKtZ2EniGkRkUXPqqFPmuqo+fyEeLDd798I3IoNl5fLL+32T9 8Oyp3sBzMLqxNTDsFfnsnNsv5ej/Tnh1tC3LQfXbiz9ZRqyFb3Fw8+xWdwn87nhTEwOx M/7BcL5xOVIjtMNFsUyruHeizsjlS+U+u3PhtPXRXBfzrMA2v7G3CcnD3cmVjqj24XVb WAgZIN19WqGCdnYDCHdYIIkRmE3TIwacRI2aI1ISMOenD+ROlMwcA45PvuBrOcn0Pwhg nVfA== 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=rOUr1jJ+j6ojrKOGYMMp1I08UMtj5w8Ma+X7l6RjDsQ=; fh=/xy1z9iSf+KcJUrxPvzIIHWwm1IFCQGsvESf4ae8E98=; b=ZIfeQs3VRGeWF8gTi29tlb4Hh8cFnLtVX2EGd0FYvlU8bTMCgvWiL/TBEHRHvriGWM 3XxQk4yhEcf62KZ7GMm7BLLhpzF1R/TicuwoXpTmF21FTXMWwl7ldaaUGYm4ChefqMQY RxXDiJynGKjjlyVQifzWzCDbLLVaabyP+uQaTSUycUBnOZq6DGzPMsR2kGYq62quSX5q vTzE1fSQi7rDK7PnB9IolLAoyGyn4foKXRwTrEcjtO5fGREbvR1/4AB0/fKPxNg6Rrkw sF0gqREwNqIrSas57xPDX3kFZ4ix1cPzarAdkmWi5HGC70fHmV0L9GaAnE0kBhCiKkna wrcQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dHkYpQxI; 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 a640c23a62f3a-a89891cfb93si273532566b.753.2024.08.30.03.20.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:20:06 -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=dHkYpQxI; 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 6841988B61; Fri, 30 Aug 2024 12:17:46 +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="dHkYpQxI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 59DF5886E5; Fri, 30 Aug 2024 12:17:42 +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, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) (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 7B8198817C for ; Fri, 30 Aug 2024 12:17:40 +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-x32a.google.com with SMTP id 5b1f17b1804b1-428e1915e18so13773315e9.1 for ; Fri, 30 Aug 2024 03:17:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013060; x=1725617860; 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=rOUr1jJ+j6ojrKOGYMMp1I08UMtj5w8Ma+X7l6RjDsQ=; b=dHkYpQxIYXSOEYKVJfIC5bUov1NfyCTc0E1g1BLCU2YZaBKNBUeZQbtLMoJ39Mg03k dnb7oDIqE3L7lMQxQVoxUpMLzpNIueLsGAaVm3Iqyoadrws4LFnYjcHzUf8GbwuE0dQ7 kohrPHi/x5BaQCENuJ4fOp2Ub8/oxw/YXwqN2n6580VQqcs8bocIZ2af1u+do8GiLrgz Y+yUKVgHu4OXhGO+o1BlEdduauDbKoZWUUTnxFdqJ3vZytbLpZmz/lDXHHPwAtK3sh2G dTEc3HZumGU2aBlEm/yuyEm67DifHjPLh/8MxdqRNpJ49kr30uy8wjRhcNcGHwQq2Lsc pkLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013060; x=1725617860; 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=rOUr1jJ+j6ojrKOGYMMp1I08UMtj5w8Ma+X7l6RjDsQ=; b=PPwB9q+QHgakzPfkoCMa2Zx+IvPuNLB9hAAk2zRcee4sRwtm7UBlhUDN3pmuhPQJiW C+DxhKk3Qq8tjAt6Dzrp93Ort2Cxb7Eh/8aFOKepmU6vwZoGm85D10dMXOfPziPkPzFh lyx2nCE9+e5jRHZ2y0fogGdGMfO6yykZL0c/H9cC0aVMMCmGwPmEKSxikX2/x4n48dJP Imp7zKwrNh41jfiOB0SXxKvhN9+wvnrV/1EM9MVJGU/17DE/88aiiozDeeUcusTNO3Rs dWJ3HBa85ZR/bpmpuySYrGHl/FW9kkqgW+4Do3aXTuJtXutZUnpiBqk/bYtHCYZRthU+ sZlQ== X-Gm-Message-State: AOJu0Yy20jdt3RKH18zOjk7RF9YCNzB2m0pDpreQ9k+5iD4dfLYIt3aE DkwnWA8hiW5kNLGiJmLWIHUhwCqTCsdQCCQq0ml/UM/2mxMD3dGWfdEzoO/c560YLb3pj8pMyj6 qnfFwC973 X-Received: by 2002:a5d:4b46:0:b0:366:f8e7:d898 with SMTP id ffacd0b85a97d-3749b58e7a1mr3547129f8f.50.1725013059727; Fri, 30 Aug 2024 03:17:39 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:39 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Simon Glass , Stefan Roese , Devarsh Thakkar , Jiaxun Yang , Rasmus Villemoes , Marek Vasut Subject: [PATCH v2 15/16] common: update: UPDATE_COMMON implies CMD_TFTPBOOT Date: Fri, 30 Aug 2024 12:16:58 +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 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 83c81edac2..968d4fb66a 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 Fri Aug 30 10:16:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 823978 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp701665wrs; Fri, 30 Aug 2024 03:20:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWFhDZ3CBiKz08q2o2nSXDZKZN6zO2Yv6K/i50/sJZZD5Tm/aE0wLcUp8cgVW8bSRJqlOkCLw==@linaro.org X-Google-Smtp-Source: AGHT+IH+1NQ/GpUW3Ej8HFYiGcQ9o1GIXy7RZjViOSSDnqoMfFQems83BFPj5kg9JrSC8h+7BqA/ X-Received: by 2002:a17:907:2d0a:b0:a86:acdd:8238 with SMTP id a640c23a62f3a-a897fad7de6mr443115766b.67.1725013217908; Fri, 30 Aug 2024 03:20:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725013217; cv=none; d=google.com; s=arc-20240605; b=F2jLnvxyzzCvjcKXPlWWse70eg5rOrrjqaX8D/ZICv/GSKOJlrcbGCoYGm5E9ANooN k2mGy0ZtKjCkWY5HYTgp0a7pMgLhbVs3nT6gAkzHujVcmYD51VrEB6BUwOYwl+Kzavzf 5a8grQZKoe6jqfIGUf1wdoBgr9ysWAYrePOy+4isG03dfUurDqD1YyPBm/eg022XUEJB lWgqsAO3dm1ZybFlDHEzRwdUOiodRrwpx0ctSaKde6WY26IJIHcuPdrOjj+hD4J1CmyN w0LuAa1Ob2C6XtSnXsGoGpwGNDEaPTxhr+5FyiMRw41q/mAZeYuEUoBHPoObqJntuiC6 UfNQ== 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=+Tv8acgq5VmfVE0WMLnnNsQ3BITV0x/6LfX/TV/+s5A=; fh=NE5h+r8OBbnhB0GmteBN9GvTV7hJxc5S/IStnD/JB0k=; b=JiKrEXTEpvvD2sDmuUurpDrweAgO+8ZduiA0IB8GMZYJQV+Bgm5zAWTvypLMrxPXs4 9TuOuOXK9R7Zt2yqn+AFkJugpcaQZB25ZnuKkxF8MRJIM06a9rskmmCVGBvSdm4fViAX s6hH0Fce9WmrUPtmneaHTut2ramJalDSXzAXCTuR9Cb0ZsssfG1JiO8Xh8I0APudsuB6 eTJu9i5VmTDTOWPlfotnb7FU5aS1xaQT6FpP/bw+F4HG4ol2FcLfqVM5S7mLcdVFIiqz qB/du61oG/j2iYMw8J4YnaKJNicxGX3udFXQT/xv+ms2kWqbCvgE3gNo9e282WhWmEWv e7Zw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BiKPRgLz; 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 a640c23a62f3a-a898916b574si270655366b.611.2024.08.30.03.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:20:17 -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=BiKPRgLz; 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 B7B5A88B6D; Fri, 30 Aug 2024 12:17:46 +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="BiKPRgLz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8CE4E88B40; Fri, 30 Aug 2024 12:17:43 +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, T_SCC_BODY_TEXT_LINE 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 9AF4288B29 for ; Fri, 30 Aug 2024 12:17:41 +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-3730749ee7aso1123409f8f.2 for ; Fri, 30 Aug 2024 03:17:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725013061; x=1725617861; 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=+Tv8acgq5VmfVE0WMLnnNsQ3BITV0x/6LfX/TV/+s5A=; b=BiKPRgLzwEAlqHmM54hretz3/M5JlDlTD4NXaMuybdpu1aoS2IpkZtKUBT2S3yQF67 wGBjuZGs+e1trxw/XPsX9/BR0BVR6YG7NwOy4RW+fQlwr+3hh+qSW8xwj++VzoIdgvsU w/Ca+RzLZ29O82JWb2NbLDZil7XErYWcs4kCuwgTF0FMA3GZ1CNIm+ih+cYziewzHZ8K PbKGbdjcZEGmn03ZHGPdk82GpW/Kh3VaS3Bfk2E95fnO21QnjwCMZ+8OfF/er1p/aH6C LkEyIhZviZuELP4fI/9HY3KLtvvRyGRiAjhILtmkwEWm4lR5wqdHF3jl77nMnJbZ6ij/ PRrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013061; x=1725617861; 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=+Tv8acgq5VmfVE0WMLnnNsQ3BITV0x/6LfX/TV/+s5A=; b=k0RFdb04x33C2Yvay1YQJb8V98XMa8kxuvolu3SqMegJMe1+pvxO2mb98fnlxdDJSQ hL+lF4jtryWzb0t10pXpOmJKJJw2b+u9LaMJrzbcqctWkxk5LYbo9+YdpkeuQSvp3nE+ Dml+CQWxqtvWAYij5SFwMesMmw1dNcyXXMb149lhlLfz9Xj3+p3dMWnof8xzO4SKNKu9 pfSeELp5btB7XSlNL5bTDzbi8Fa/rdQthjiAmoKVBuX2gy8WC7g4O9zCNrXpdzIlKK+Q c8zb+3GifwlpSqeh59X6fAlblZVNPMNhu6kDhwO7kmaSQznLZNrplVsjiPQ/DUtORpVQ bTGQ== X-Gm-Message-State: AOJu0Yz3LHJV6s9v/v8OfKRPZrwbRjkWZNfPmMBKnM1U/48orl1GvM92 AomjyrrdXyw5N6/lGnnEvyLlmJCTS90hA7yVQd7YR83YwxST6M5Z2XL8IbwqYWpo3sjJLssAVFx 0XKLudxpC X-Received: by 2002:a5d:5d86:0:b0:374:b69f:8 with SMTP id ffacd0b85a97d-374b69f013emr404401f8f.33.1725013060877; Fri, 30 Aug 2024 03:17:40 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b6a3d27fsm472728f8f.59.2024.08.30.03.17.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:17:40 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Peter Robinson , Jerome Forissier , Tom Rini , Simon Glass , Mattijs Korpershoek , AKASHI Takahiro , Heinrich Schuchardt , Michal Simek , Francis Laniel , Anand Moon Subject: [PATCH v2 16/16] cmd: pxe: CMD_PXE implies CMD_TFTPBOOT Date: Fri, 30 Aug 2024 12:16:59 +0200 Message-Id: <2fc6c69a1aa28b578684642959906cfe000b2a0c.1725012294.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 978f44eda4..be15a4d267 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2091,6 +2091,7 @@ config CMD_ETHSW config CMD_PXE bool "pxe" select PXE_UTILS + imply CMD_TFTPBOOT help Boot image via network using PXE protocol