Signed-off-by: Tom Rini trini@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 38d8773f9083..f883c95f9643 100644 --- a/board/samsung/common/gadget.c +++ b/board/samsung/common/gadget.c @@ -10,7 +10,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(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); diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index b29d9b0d5bac..defbe4bf335c 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -16,7 +16,7 @@ #define DFU_DEFAULT_POLL_TIMEOUT 300
/* USB Samsung's IDs */ -#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8 +#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 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index c6f6246d76ce..967ba83d4510 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -21,7 +21,7 @@ #define DFU_MANIFEST_POLL_TIMEOUT 25000
/* THOR */ -#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_USB_GADGET_VENDOR_NUM +#define CFG_G_DNL_THOR_VENDOR_NUM CONFIG_USB_GADGET_VENDOR_NUM #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
/* UMS */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 5567505c8182..67d01e816f9a 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -26,7 +26,7 @@
/* USB Samsung's IDs */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8 +#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 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f2304c23b80f..f04275b6b1d4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -50,7 +50,7 @@ CFG_FSL_SERDES2 CFG_GATEWAYIP CFG_GMII CFG_G_DNL_THOR_PRODUCT_NUM -CONFIG_G_DNL_THOR_VENDOR_NUM +CFG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_UMS_VENDOR_NUM CONFIG_HDMI_ENCODER_I2C_ADDR