[PoC 049/241] global: Migrate CONFIG_G_DNL_THOR_PRODUCT_NUM to CFG

Tom Rini trini at konsulko.com
Sun Nov 20 14:30:40 CET 2022


Signed-off-by: Tom Rini <trini at konsulko.com>
---
 board/samsung/common/gadget.c    | 2 +-
 include/configs/exynos4-common.h | 2 +-
 include/configs/odroid_xu3.h     | 2 +-
 include/configs/s5p_goni.h       | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c
index 6d783e61e0d3..38d8773f9083 100644
--- a/board/samsung/common/gadget.c
+++ b/board/samsung/common/gadget.c
@@ -11,7 +11,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 {
 	if (!strcmp(name, "usb_dnl_thor")) {
 		put_unaligned(CONFIG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
-		put_unaligned(CONFIG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
+		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);
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index 81f450cde6c4..b29d9b0d5bac 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -17,7 +17,7 @@
 
 /* USB Samsung's IDs */
 #define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
+#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index a1542f3f8025..c6f6246d76ce 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -22,7 +22,7 @@
 
 /* THOR */
 #define CONFIG_G_DNL_THOR_VENDOR_NUM	CONFIG_USB_GADGET_VENDOR_NUM
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM	0x685D
+#define CFG_G_DNL_THOR_PRODUCT_NUM	0x685D
 
 /* UMS */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index f898d2d9ee52..5567505c8182 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -27,7 +27,7 @@
 /* USB Samsung's IDs */
 
 #define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
+#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8203c5ccee12..f2304c23b80f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -49,7 +49,7 @@ CFG_FSL_SERDES1
 CFG_FSL_SERDES2
 CFG_GATEWAYIP
 CFG_GMII
-CONFIG_G_DNL_THOR_PRODUCT_NUM
+CFG_G_DNL_THOR_PRODUCT_NUM
 CONFIG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM
 CONFIG_G_DNL_UMS_VENDOR_NUM
-- 
2.25.1



More information about the U-Boot mailing list