[PoC 052/241] global: Migrate CONFIG_G_DNL_UMS_VENDOR_NUM to CFG

Tom Rini
2022-11-20T13:43:02Z

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 71d361548434..0fe20be48556 100644
--- a/board/samsung/common/gadget.c
+++ b/board/samsung/common/gadget.c
@@ -13,7 +13,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
put_unaligned(CFG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
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(CFG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
put_unaligned(CFG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
} else {
put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor);
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index a53846b762c1..1fbdebb64511 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -40,7 +40,7 @@
#define DFU_DEFAULT_POLL_TIMEOUT 300

/* USB IDs */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525
#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 f3db02d78d8b..63e26687dbce 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -18,7 +18,7 @@
/* USB Samsung's IDs */
#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 CFG_G_DNL_UMS_VENDOR_NUM 0x0525
#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5

/* Common environment variables */
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index bd8d455375dd..50213a383528 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -25,7 +25,7 @@
#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D

/* UMS */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525
#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5

#define CFG_DFU_ALT_SYSTEM \
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index d1c3f495c253..1e211eccee7b 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -28,7 +28,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 CFG_G_DNL_UMS_VENDOR_NUM 0x0525
#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 dbb84ab9ad08..d6809f8118d7 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -85,7 +85,7 @@
#define DFU_DEFAULT_POLL_TIMEOUT 300

/* USB IDs */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525
#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
#endif

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5da8953712a5..3473e7c4560b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -52,7 +52,7 @@ CFG_GMII
CFG_G_DNL_THOR_PRODUCT_NUM
CFG_G_DNL_THOR_VENDOR_NUM
CFG_G_DNL_UMS_PRODUCT_NUM
-CONFIG_G_DNL_UMS_VENDOR_NUM
+CFG_G_DNL_UMS_VENDOR_NUM
CONFIG_HDMI_ENCODER_I2C_ADDR
CONFIG_HOSTNAME
CONFIG_HSMMC2_8BIT
--
2.25.1