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 C7F21C636CC for ; Sun, 5 Feb 2023 22:51:52 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 83CC485A94; Sun, 5 Feb 2023 23:42:34 +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="H+Szoe+A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BBD5B85A0A; Sun, 5 Feb 2023 23:40:22 +0100 (CET) Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (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 667CA859D9 for ; Sun, 5 Feb 2023 23:39:43 +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-xd2f.google.com with SMTP id y7so3881160iob.6 for ; Sun, 05 Feb 2023 14:39:43 -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=Az9AnOGT69H05UrCiiQjoF4KsG9h2fqbEemXGXtEPko=; b=H+Szoe+ANnszZ4lxPibC1wRWeZlH5m/kjc/rWvhn1omRzbWFCHKChPe3AKHtV68BjS pdA7UXXvvSoJRc0jbbwTl21hz6qUsLdXj6uC1/+pIwIdC3qbRPscGgHeUQOFmDB1541f G5H7f8JJ6Sv0DXiZLEFN/pDaLYRlQZISk993I= 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=Az9AnOGT69H05UrCiiQjoF4KsG9h2fqbEemXGXtEPko=; b=MTnDXojSBy73FRSHEQTm+RlX7mobKzAS0tk/vz2uUtnd0NFP2F+In2KpmfIHMP6yeE D2/SCahjvuXEO9Liapu2e9lQlB1pJH8K7wnX0lq99lueO5HbA9EZzVSIuyiGtZmC6VwH CLfRTrfla1zf88BYznk/A2p6kY6AqC/rYnyhUWX2mQvWQpSRpCSFEFPGw3luUOun+m6F VqW46fhiSzwLNpzA6zszzYProNbWE2XY4VPCYsF7MS/68Vgada0xnpDQpnyDBIfzD4a1 eLhGqYMZnHu3LAr7vYS/ulJUU0Td07z+GniIXe/UMdC5Q/NzQ/x3rcciM+PlfiOfFB1/ w2xQ== X-Gm-Message-State: AO0yUKW9HQsy+gsEwxwizd6Gyra9+PKo3W3Qatc2qEavf1IPC29Cqio/ zXCg42yDimAmyHzGJHCrXcKhKj7Sru+FtW7C X-Google-Smtp-Source: AK7set+ZxB2mMBg8Mte9I0sUevoEdYLRNhuNYuaTfIyzQT9ZKRM2ZK/P709Al3SBlq9v5H/mQPNhzQ== X-Received: by 2002:a5e:c912:0:b0:716:9e92:a016 with SMTP id z18-20020a5ec912000000b007169e92a016mr11389855iol.21.1675636782871; Sun, 05 Feb 2023 14:39:42 -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 m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 060/169] Correct SPL uses of CMD_USB Date: Sun, 5 Feb 2023 15:36:46 -0700 Message-Id: <20230205223836.231657-61-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-1-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 8 usages of this option to the non-SPL form, since there is no SPL_CMD_USB defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) include/configs/am335x_evm.h | 2 +- include/configs/apple.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/iot2050.h | 2 +- include/configs/qemu-arm.h | 2 +- include/configs/rockchip-common.h | 2 +- include/configs/rpi.h | 2 +- include/configs/tegra-common-post.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index d66614598a1..cef19090f68 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -47,7 +47,7 @@ #define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ #devtypel #instance " " -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else # define BOOT_TARGET_USB(func) diff --git a/include/configs/apple.h b/include/configs/apple.h index ee6e1169b3b..0576bc04c94 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -15,7 +15,7 @@ #define BOOT_TARGET_NVME(func) #endif -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else #define BOOT_TARGET_USB(func) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index c6d7cfbcbcd..44e45e7791d 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -38,7 +38,7 @@ # define BOOT_TARGET_MMC(func) #endif -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else # define BOOT_TARGET_USB(func) diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h index 7d087413362..cfff46ce339 100644 --- a/include/configs/iot2050.h +++ b/include/configs/iot2050.h @@ -19,7 +19,7 @@ #define EXTRA_ENV_IOT2050_BOARD_SETTINGS \ "usb_pgood_delay=900\0" -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) \ func(USB, usb, 0) \ func(USB, usb, 1) \ diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 23fba23ce0a..60ac5489ac1 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -36,7 +36,7 @@ /* Environment options */ -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else # define BOOT_TARGET_USB(func) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 96deb4b3b6c..37321f964fb 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -32,7 +32,7 @@ #define BOOT_TARGET_SCSI(func) #endif -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else #define BOOT_TARGET_USB(func) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 2593edcf96b..032d228f477 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -131,7 +131,7 @@ #define BOOT_TARGET_MMC(func) #endif -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else #define BOOT_TARGET_USB(func) diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 0fdb5a81605..991ffbb7dff 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -7,7 +7,7 @@ #ifndef __TEGRA_COMMON_POST_H #define __TEGRA_COMMON_POST_H -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else # define BOOT_TARGET_USB(func) -- 2.39.1.519.gcb327c4b5f-goog