From patchwork Mon Jan 30 15:15:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734262 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=RvLZ8x00; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5CVS4r4sz1yhq for ; Tue, 31 Jan 2023 02:57:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AB72A859F5; Mon, 30 Jan 2023 16:56:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="RvLZ8x00"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AD09B859A3; Mon, 30 Jan 2023 16:55:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 C6C998597E for ; Mon, 30 Jan 2023 16:17:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd32.google.com with SMTP id r6so2056547ioj.5 for ; Mon, 30 Jan 2023 07:17:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=Zg01voo4ohs4J9tO7hvTDnB4/icRdfMD5SbukSV+eO8=; b=RvLZ8x00XfsIs9Y6fAUZa27h21L/ZzNBu+jBM8RsoqRK6NFZrqG7teIok+hU6IMaGb 1G0B7cZZcv0n3UMDbCavc154PNvuWRwCE0u4f8Ulxw81IwIysF1yKeVxhaMGLTvvDGeb HwhSnAnqULRJ57ceBbuOAmZoK2coWOVCbUZqA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Zg01voo4ohs4J9tO7hvTDnB4/icRdfMD5SbukSV+eO8=; b=CiM52zcr27WmoGTk85GbIhu/MM35Vx0nzeF7TyzL+1oQ4ZTVvcR5yg/0BHFruBdLpl 86ZQpzS+X7zjirsxhtqjUHg2KYYMfe+Hgu1x663M6X4UGf6zPaXoUOaJ+Szfq4OsKP3j 5mEy6i/hYtxnNJKvcEuOKkHfwWuD9KFEjnMP2dhJCNDnqA8/I4btfgjzDa9duzfUQzFf NquFvYT8rJaCFyipXlK+bPvOrEB4x+BTZThWBaD3Y4hzX3h6F2Nfh4sBnKmhkHWkzE9q kf77Cx45i3vjpiMEn+2ZEi6BIsItgxLXT6gnSZxYBckG8yXJp+HuaWRqGYdf1wlOXAaW iBsg== X-Gm-Message-State: AO0yUKUzz1b3WG1WpfaL1kG2Jp/heTbYJeZX8yj+iJPF2olufZqoCpN+ R64/AJY9hc6tF7BK71vi2ekQak1MAaSnCWEl X-Google-Smtp-Source: AK7set+2brv1xMMx77DEgihlBA460kXIFijB7gV2Le4ZXzRJqdqU6psfuYnNLuWBCFa/Ib9a4T8yvA== X-Received: by 2002:a05:6602:1310:b0:71e:d970:9ca4 with SMTP id h16-20020a056602131000b0071ed9709ca4mr1277850iov.18.1675091837935; Mon, 30 Jan 2023 07:17:17 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Joe Hershberger , Ramon Fried Subject: [PATCH 113/171] Correct SPL use of NETDEVICES Date: Mon, 30 Jan 2023 08:15:14 -0700 Message-Id: <20230130151612.212732-114-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_NETDEVICES defined in Kconfig Signed-off-by: Simon Glass --- net/bootp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bootp.c b/net/bootp.c index cae041988db..8b1a4ae2ef8 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -1078,7 +1078,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, #endif /* CONFIG_SYS_BOOTFILE_PREFIX */ dhcp_packet_process_options(bp); if (CONFIG_IS_ENABLED(EFI_LOADER) && - CONFIG_IS_ENABLED(NETDEVICES)) + IS_ENABLED(CONFIG_NETDEVICES)) efi_net_set_dhcp_ack(pkt, len); #if defined(CONFIG_SERVERIP_FROM_PROXYDHCP)