arm: samsung: Rename CONFIG_G_DNL_*_NUM variables

Following how g_dnl_bind_fixup is used on other platforms, rename the
unchanging defines used here to be prefixed with EXYNOS rather than
Samsung, and define them here.

Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c
index 6d783e61e0d347fae17294576f822f30f3cef016..9487f9ec4e0cfb0bf17f1fe1b1c5c3e9811706c5 100644 (file)
--- a/board/samsung/common/gadget.c
+++ b/board/samsung/common/gadget.c
@@ -7,14 +7,20 @@
 #include <common.h>
 #include <linux/usb/ch9.h>
 
+#define EXYNOS_G_DNL_THOR_VENDOR_NUM   0x04E8
+#define EXYNOS_G_DNL_THOR_PRODUCT_NUM  0x685D
+
+#define EXYNOS_G_DNL_UMS_VENDOR_NUM    0x0525
+#define EXYNOS_G_DNL_UMS_PRODUCT_NUM   0xA4A5
+
 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(EXYNOS_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
+               put_unaligned(EXYNOS_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(EXYNOS_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
+               put_unaligned(EXYNOS_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 f9b3d19480ed88f5e10ee268dbf8c3a6bc79a620..3aed6299ed56fbd9c7ae8e0e5d69a41805183320 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -38,10 +38,6 @@
 /* USB Gadget (DFU, UMS) */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
 #define DFU_DEFAULT_POLL_TIMEOUT       300
-
-/* USB IDs */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM    0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM   0xA4A5
 #endif
 #endif
 

diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index bf965e5cedb3c22275a11a94ba63a4fa773b0e20..e8c182bc2f395aaff6ae9d62334a7f58491809a0 100644 (file)
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -12,12 +12,6 @@
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
-/* USB Samsung's IDs */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
-#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
-
 /* Common environment variables */
 #define ENV_ITB \
        "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 5bbe7aadcb2555a0787a1c3c608bf1c539db0d0d..bf63a4de076575feb7f0c00c1d782c11cf83f306 100644 (file)
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -20,14 +20,6 @@
 #define DFU_DEFAULT_POLL_TIMEOUT       300
 #define DFU_MANIFEST_POLL_TIMEOUT      25000
 
-/* THOR */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM   CONFIG_USB_GADGET_VENDOR_NUM
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM  0x685D
-
-/* UMS */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM    0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM   0xA4A5
-
 #define CONFIG_DFU_ALT_SYSTEM               \
        "uImage fat 0 1;"                   \
        "zImage fat 0 1;"                   \

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 97f5dd0e473ab5b44e15b06219a01980242bf1cd..da83db1f68ab1d6b0c44ec9122b72a32cc2daa75 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -24,13 +24,6 @@
 /* USB Composite download gadget - g_dnl */
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
-/* USB Samsung's IDs */
-
-#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
-#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
-
 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
 
 /* partitions definitions */

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index bbbdea6664ca27ea5c29701bc74c815d23d502ed..088cd4d4f7f69cbc45cc0640aed9b0ae98c55054 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -83,10 +83,6 @@
  */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
 #define DFU_DEFAULT_POLL_TIMEOUT       300
-
-/* USB IDs */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM    0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM   0xA4A5
 #endif
 
 /*