[PoC 051/241] global: Migrate CONFIG_G_DNL_UMS_PRODUCT_NUM to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 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