From patchwork Mon Jan 30 15:16:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734226 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=UbpA9vzB; 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 4P5C1X6fGbz23hS for ; Tue, 31 Jan 2023 02:35:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6C8A785810; Mon, 30 Jan 2023 16:26:29 +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="UbpA9vzB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 49DCE859EE; Mon, 30 Jan 2023 16:20:18 +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-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 76C03859D8 for ; Mon, 30 Jan 2023 16:19:31 +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-il1-x12e.google.com with SMTP id w13so1142167ilv.3 for ; Mon, 30 Jan 2023 07:19:31 -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=c6B6BpeRwxYhAPe8xcd77xk6JauUqjqEUhwPmmBTXXw=; b=UbpA9vzBYqdRpfOeHb6JYUpIaHhmOGAPOwnahHrOcc1gKR/MyfhBXQqB7vA9oNLtZX wI8pVfY8JUd2rd1MokCI6N4Ttk2qr/PL+U6ufsOSOd/S4xo/2YeOOSKsaN4i62eA9/Re +gMEXghD6VvCm6jndc3oYLdUBiEnuosfNuzC8= 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=c6B6BpeRwxYhAPe8xcd77xk6JauUqjqEUhwPmmBTXXw=; b=PkgSiLIg3g8kG/xn8Htrqod6flWLFFQIYuz9iqUb3lKFnrTUV1CvSMlenVrI6iS3Dq 0/0JaRDCaZuiHtFXcqLm50GRpOGmNeeM/N5AWsYugZkVvDbrl5oC7eGZJxXnP4/oPGVR 8JWkkQaBnzr+WxSXsE1m8IIKjV7pQ/OSDF59qZV09Qlg/dpswyMes0WK3UuL0yPpu0hj Ifea+443xyrHyL5ddW7CwZjhhKkE1/g7EIl4yFS+tV2Dq4DP8TAEU8jrFypLaAmSH64z QfjnQfnv5u1P3dTNO1Q9wiRn0wVgrITBsgXtsfwVjk7cmq6T0pHvX7nLISPeMVXWpDeg +bIg== X-Gm-Message-State: AO0yUKVFmKbwg4TkCnfMJ3aq3ZxPnzoFNSbZ9fRAjnzNdQva/NeRW9cZ hRv/dGSZMhL2l8q1H9xKEJ3sdlZVBLXEg4av X-Google-Smtp-Source: AK7set+WZlsZvoR7AjvxDb57JO6DqIah4lZb7JN2ci4HcCIsuB5zwviBKUQk9qrMux40CACKhvM9Ow== X-Received: by 2002:a05:6e02:190d:b0:310:c833:b325 with SMTP id w13-20020a056e02190d00b00310c833b325mr11435492ilu.6.1675091891594; Mon, 30 Jan 2023 07:18:11 -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.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Bin Meng , =?utf-8?q?Pali_Roh=C3=A1r?= Subject: [PATCH 163/171] Correct SPL uses of USB_KEYBOARD Date: Mon, 30 Jan 2023 08:16:04 -0700 Message-Id: <20230130151612.212732-164-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 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 --- 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;