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>
This commit is contained in:
parent
54f80dd290
commit
b5f7d88162
6 changed files with 10 additions and 33 deletions
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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} " \
|
||||
|
|
|
@ -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;" \
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue