From patchwork Sun Feb 5 22:40:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1737873 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=85.214.62.61; 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=Rz6GvMpY; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P94gH1kY2z23fc for ; Mon, 6 Feb 2023 10:03:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0FC8885B4A; Sun, 5 Feb 2023 23:55:58 +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="Rz6GvMpY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 77C0585B19; Sun, 5 Feb 2023 23:53:41 +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-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (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 2095F85AD4 for ; Sun, 5 Feb 2023 23:43:15 +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-xd33.google.com with SMTP id y7so3882650iob.6 for ; Sun, 05 Feb 2023 14:43:15 -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=6ZfMoo1nKN8om27ctbRTEnHQQZZmitVsKdb3v61YhCU=; b=Rz6GvMpYmOKqTFHLccyhoDhktZjhDQCUV85WDUm+khipWNEcs0cxVt31GnS6S6AtD5 pEPb30RURKoC2c1qQO1PnLHqmQ7oVF3TO0GcsjuDJUc64pbGS4Ehu6+EfpkI7B7camw6 QjSzKRiYKPqSX6XJ6voQzURutTRbj/6CmmeYg= 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=6ZfMoo1nKN8om27ctbRTEnHQQZZmitVsKdb3v61YhCU=; b=3e2qwNUXKOLAc2SLO/8vgLMcybevGnrbqPfSeFmEwGFNjkq7uc3GFlYJ2PN1eZFilg 1YnCxk66RS5tUGzwWDhWzh/1sYkFeYEFUsyWaCL6zQesRqDwEzqI2Djlp2XzjEKIqHpr J5HTKnv6EdHfP99zM0CcLVK85Q9yAdwL+pNl2xaN3sQPhweWMC/16dQ6hYzyGROWjlBQ 5spkD0bcA3IRa1ysImS51al5/Ri63ZStDffU0ucPRB4FByNuyTFScISZFeMUxDQ+ybEv 4lxiSYPzanTFwWgYhOx1cXY4omUW6DL8vjFGgG5VhCMAC/WOV/9K+p422Ujn7OCgZqDn XOuQ== X-Gm-Message-State: AO0yUKV7vkLBRZ9WdnLXmtk07A6ZiCNoW87yciKMr8zcg+hmlvtJ/liq Mae2aMALj1aKTdgWpDcJ7lLExc+N4EXVkQ/C X-Google-Smtp-Source: AK7set8P5nZkiSVorMH7JzTWifyJHi1ru/wZ9OCkQ6ejwxEfo5zTTXQeNr9Ro9CcIXwvC8CELY8c4A== X-Received: by 2002:a5d:9b84:0:b0:713:bd7a:8f93 with SMTP id r4-20020a5d9b84000000b00713bd7a8f93mr13842994iom.10.1675636985166; Sun, 05 Feb 2023 14:43:05 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:04 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 111/169] Correct SPL use of NETDEVICES Date: Sun, 5 Feb 2023 15:40:20 -0700 Message-Id: <20230205224118.233425-112-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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)