From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C6386C636CD for ; Mon, 6 Feb 2023 01:01:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7B9A486022; Mon, 6 Feb 2023 01:59:38 +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="G3DgJQha"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E5B7585FEE; Mon, 6 Feb 2023 01:59:32 +0100 (CET) Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 97FA086026 for ; Mon, 6 Feb 2023 01:59:18 +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-xd2a.google.com with SMTP id j17so2065997ioa.9 for ; Sun, 05 Feb 2023 16:59:18 -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=UbUNPD4m2QTg809OCSjdaYVqLmKdwc4xrfqhHb35EFU=; b=G3DgJQhaEucsvTF9mbfH1G502MRQIZyihcbDRuDvuz5pWEGHoxxzBe0bWNwm6M/uO9 cmGCGJiCT7D0JPOxfjcZFHf6+D8xgRVE/Hu/UhE2j9A7/Fi5Cx9/f1FmqMnG2EaJaHxh IOTS8Iwe8tgScWeKsrYg0JvkVMQ03u7bA6uj0= 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=UbUNPD4m2QTg809OCSjdaYVqLmKdwc4xrfqhHb35EFU=; b=B8RZQidncl7LD0c2yAlrJD62wIHy7udlnIhrOz3zizmdC24CVlGS8Fg9hwEHHGSxJa 7mNd8H+gH9sJ5mPhEu5rJQJvijwjI8EdMjgKU484lZ+FfPY7rY5C719xF1otIpQQPLWc dTb1AdIzU+bxcNeqxpCNqRXgf93Phxt32rcC1d1mWFvuN/Vr1XggYN8FrR3hJweX2Y9h Wr+uYc0aHAOalTSxTTZhHUOfsPblOSfNk1PtZ5SwNcQbYPhNcLN7hyK+8Ki5t5MLKCIR AJ60HX8xPw66uxpaebeJWVUvpLd9ZjijPrST3s681P3u1d/gjBI/Ctj8uzHNdyViBhg+ w/3A== X-Gm-Message-State: AO0yUKWZgJxWTIbAFllA3vgS9AjfxPMRd+d26ZZkInjxjSUmSyYG5MEX ER60prih9gIBTvpTxPjt/DT2xfh+WGdWalf6 X-Google-Smtp-Source: AK7set8fJuQSwMfnvFk40mJelA2tk2fV9RYe27tnBMJZr8q5gHSk3gJ55pkBQpRZAVFYrWyXS4B93A== X-Received: by 2002:a5e:8e04:0:b0:71f:2e0b:5c64 with SMTP id a4-20020a5e8e04000000b0071f2e0b5c64mr12202923ion.3.1675645113348; Sun, 05 Feb 2023 16:58:33 -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 b22-20020a6bb216000000b006e2f42a30c2sm2734703iof.35.2023.02.05.16.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 16:58:33 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 161/169] Correct SPL uses of USB_KEYBOARD Date: Sun, 5 Feb 2023 17:55:28 -0700 Message-Id: <20230206005537.254541-162-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206005537.254541-27-sjg@chromium.org> References: <20230206005537.254541-27-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 2 usages of this option to the non-SPL form, since there is no SPL_USB_KEYBOARD defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/x86/cpu/coreboot/coreboot.c | 2 +- arch/x86/cpu/efi/payload.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index aaa5ae112e4..d7eedbd7436 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -77,7 +77,7 @@ static void board_final_init(void) int last_stage_init(void) { /* start usb so that usb keyboard can be used as input device */ - if (CONFIG_IS_ENABLED(USB_KEYBOARD)) + if (IS_ENABLED(CONFIG_USB_KEYBOARD)) usb_init(); board_final_init(); diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c index 1c28a43778e..19a25dd6408 100644 --- a/arch/x86/cpu/efi/payload.c +++ b/arch/x86/cpu/efi/payload.c @@ -171,7 +171,7 @@ int reserve_arch(void) int last_stage_init(void) { /* start usb so that usb keyboard can be used as input device */ - if (CONFIG_IS_ENABLED(USB_KEYBOARD)) + if (IS_ENABLED(CONFIG_USB_KEYBOARD)) usb_init(); return 0; -- 2.39.1.519.gcb327c4b5f-goog