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 56F04C4332F for ; Sun, 20 Nov 2022 13:43:14 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 04932852D2; Sun, 20 Nov 2022 14:35:22 +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="d3NYHOf1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4652F85299; Sun, 20 Nov 2022 14:34:35 +0100 (CET) Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) (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 8843085261 for ; Sun, 20 Nov 2022 14:34:32 +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-x72b.google.com with SMTP id v8so6485865qkg.12 for ; Sun, 20 Nov 2022 05:34:32 -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=Hlp0eECUSfHXCuDbr9Dlv1WI3TQi0TqMwv0rdREXSos=; b=d3NYHOf1LaTWOJlyEGf/upyFfLCb/txafkZA5Da5TjHRHXCvZxexvlYea1Vw3YDo+A naZ9Etr8hB77idEPkxir+nkLtKEg7uI28rtDniXb8JooOB4vnJs0ltb+kX49LBoxfUbg 1SbPhdZ5jzYbrZzFXFD+QAqBfri9FZcnDQpSQ= 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=Hlp0eECUSfHXCuDbr9Dlv1WI3TQi0TqMwv0rdREXSos=; b=nANrOic6w5fbmlJuh1UOOkqMPXt1B2PJIVvT/rPV2FxM46Gj453uEgAR+WjVLF8t+4 Ge2qE06pD7DzLcexz/TWxUe7KMAjcmn8tjEsNNMVxXgyFE7XGI9WNZMBmF06+dTC9YBG HzJvjyUnUA6Dzo/6mrg/mqxqXEkekAdwutM2cc+JtVeAGwpP0/Gg/NEwQe14fW3RdAkJ FUiRfXAY3FjV9ZKWIkCuKrg1loa08juVfAmmiOyqKyud1JdaYI9nnGMDyIgCfYtweisI vWQ4MB158k0uE/uUcFvXh8cb8MK/2jPVT0Tf4eqyul4iavTpZiA0zjm7Ok34Q9HKBphf Eyng== X-Gm-Message-State: ANoB5plR83agARNHWku+lRr2yNwBl5TVCHXulkYGD01xxarRoMpvVuac CCQYkjoohn0yGSTs2H2Dn8OSWEGrzJT8nQ== X-Google-Smtp-Source: AA0mqf4htURAYln+mcWKY8ysoSNAve7nUPfAN5sQYEZqAiBOlmZGvzPyDgI/ag9i4mMwr4EDdv2Vng== X-Received: by 2002:a37:4043:0:b0:6ee:b095:a047 with SMTP id n64-20020a374043000000b006eeb095a047mr12848687qka.524.1668951271106; Sun, 20 Nov 2022 05:34:31 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:30 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 051/241] global: Migrate CONFIG_G_DNL_UMS_PRODUCT_NUM to CFG Date: Sun, 20 Nov 2022 08:30:42 -0500 Message-Id: <20221120133352.3055600-52-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <20221120133352.3055600-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 --- board/samsung/common/gadget.c | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/exynos4-common.h | 2 +- include/configs/odroid_xu3.h | 2 +- include/configs/s5p_goni.h | 2 +- include/configs/socfpga_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c index f883c95f9643..71d361548434 100644 --- a/board/samsung/common/gadget.c +++ b/board/samsung/common/gadget.c @@ -14,7 +14,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct); } else if (!strcmp(name, "usb_dnl_ums")) { put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor); - put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct); + put_unaligned(CFG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct); } else { put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor); put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct); diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 56bb856a6dc2..a53846b762c1 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -41,7 +41,7 @@ /* USB IDs */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #endif #endif diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index defbe4bf335c..f3db02d78d8b 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -19,7 +19,7 @@ #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 /* Common environment variables */ #define ENV_ITB \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 967ba83d4510..bd8d455375dd 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -26,7 +26,7 @@ /* UMS */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #define CFG_DFU_ALT_SYSTEM \ "uImage fat 0 1;" \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 67d01e816f9a..d1c3f495c253 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -29,7 +29,7 @@ #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 3603bb9f4a0b..dbb84ab9ad08 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -86,7 +86,7 @@ /* USB IDs */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #endif /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f04275b6b1d4..5da8953712a5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -51,7 +51,7 @@ CFG_GATEWAYIP CFG_GMII CFG_G_DNL_THOR_PRODUCT_NUM CFG_G_DNL_THOR_VENDOR_NUM -CONFIG_G_DNL_UMS_PRODUCT_NUM +CFG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_UMS_VENDOR_NUM CONFIG_HDMI_ENCODER_I2C_ADDR CONFIG_HOSTNAME -- 2.25.1