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 03275C433FE for ; Sun, 20 Nov 2022 14:15:38 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3EA3D85412; Sun, 20 Nov 2022 15:09:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="k8kNh+P6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 81530852EA; Sun, 20 Nov 2022 15:09:21 +0100 (CET) Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (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 E3769852F5 for ; Sun, 20 Nov 2022 15:09:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x733.google.com with SMTP id d7so6529078qkk.3 for ; Sun, 20 Nov 2022 06:09:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lfe6xnZVVaBpju/+PRKuUXdhbDWD5oEzhFZGtS6hMaM=; b=k8kNh+P69AaE/F8VsI7PvDdVTdL2iOXSRULWzg5/DMogOiYPe7YFbxYeN87r1zOo9F bkcebaPHIX3PtONKSEItubiyVlAreIPvNUryUbAM1IKFxGCSIAaicZrjLTqSFPJY1t/k N4N/Tg6UY/PDOhoGi5AlSXyh+zARTmZwpPSdg= 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lfe6xnZVVaBpju/+PRKuUXdhbDWD5oEzhFZGtS6hMaM=; b=vU/49qMpkzgmnSPJmQmsE4svq3eXBNKdX+f0TeCY01AyoAiQ5G6YwJxssVL+ZMVgbD 8egejITWUJkhiISeU6TjLb0AXp1pjEIEidGUFvK6j2WWJeNBpJ8q2cjvPqHc9pJkh1nH OMCcUmWF1yYB9y6ZAgIEz2Lhcb8mnD3mVufUw+CYYCYfCzbp6j3EYQE05X4fs3aOA5Pb 1tgLOzvQc7PlIah/7uzGxxCp/xvOmKIpMz5CZYjH7BvLCzrJDGrzq72o9j4YXU8nb/iv n862/T/lqYGHlL50Izi6Gfbf37pBR4+rH59h34dgreqfQPmuUxlhXSRq5ikqKfa4bkRZ 2a/A== X-Gm-Message-State: ANoB5pkYTi4ApURNYbKz59/NlLGfF9pBSeu79SGI6laGWkLfMutZJo17 jNUKNRGf1XEwEN/goDrmV2JCzLgf3E/puA== X-Google-Smtp-Source: AA0mqf5GKLvm463lNHkHNkF0VatPsSjzBcMSVXNxBVX6nH7vfOapVBKxT25YiQCkpuT0xyDSzQ4lxw== X-Received: by 2002:a05:620a:a0e:b0:6f8:ab99:6c50 with SMTP id i14-20020a05620a0a0e00b006f8ab996c50mr13110293qka.639.1668953350702; Sun, 20 Nov 2022 06:09:10 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id bk23-20020a05620a1a1700b006ce580c2663sm6387502qkb.35.2022.11.20.06.09.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:09 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 173/241] global: Migrate CONFIG_SCSI_DEV_LIST to CFG Date: Sun, 20 Nov 2022 09:08:03 -0500 Message-Id: <20221120140829.3057894-64-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120140829.3057894-1-trini@konsulko.com> References: <20221120135520.3057773-4-trini@konsulko.com> <20221120140829.3057894-1-trini@konsulko.com> 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 Signed-off-by: Tom Rini --- drivers/scsi/scsi.c | 4 ++-- include/configs/ls1021aiot.h | 2 +- include/configs/ls1028ardb.h | 2 +- include/configs/ls1043ardb.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 3e769b0843f0..a020a7da23a5 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -18,8 +18,8 @@ #include #if !defined(CONFIG_DM_SCSI) -# ifdef CONFIG_SCSI_DEV_LIST -# define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST +# ifdef CFG_SCSI_DEV_LIST +# define SCSI_DEV_LIST CFG_SCSI_DEV_LIST # else # ifdef CONFIG_SATA_ULI5288 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index cc6d07b40620..d6122856f069 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -61,7 +61,7 @@ #ifndef PCI_DEVICE_ID_FREESCALE_AHCI #define PCI_DEVICE_ID_FREESCALE_AHCI 0x0440 #endif -#define CONFIG_SCSI_DEV_LIST {PCI_VENDOR_ID_FREESCALE, \ +#define CFG_SCSI_DEV_LIST {PCI_VENDOR_ID_FREESCALE, \ PCI_DEVICE_ID_FREESCALE_AHCI} /* SPI */ diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h index 8c53636beac3..ee4f885c5341 100644 --- a/include/configs/ls1028ardb.h +++ b/include/configs/ls1028ardb.h @@ -52,7 +52,7 @@ /* SATA */ #define SCSI_VEND_ID 0x1b4b #define SCSI_DEV_ID 0x9170 -#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} +#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} /* Initial environment variables */ #ifndef SPL_NO_ENV diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index ec81b3ca5b36..da84e517b127 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -210,7 +210,7 @@ #ifndef SPL_NO_SATA #define SCSI_VEND_ID 0x1b4b #define SCSI_DEV_ID 0x9170 -#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} +#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} #endif #include diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d77171c2c553..179d6918cd64 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -182,7 +182,7 @@ CFG_SANDBOX_SPI_MAX_CS CFG_SAR2_REG CFG_SAR_REG CFG_SCIF_A -CONFIG_SCSI_DEV_LIST +CFG_SCSI_DEV_LIST CONFIG_SC_TIMER_CLK CONFIG_SERIAL_BOOT CONFIG_SERVERIP -- 2.25.1