| Message ID | 1476317503-7062-8-git-send-email-marcel.ziswiler@toradex.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Warren |
| Headers | show |
On 12.10.2016 17:11, Marcel Ziswiler wrote: > From: Max Krummenacher <max.krummenacher@toradex.com> > > remove now unused CONFIG_TRDX_PID_XXX With config block support, we can elaborate the exact module precisely, so removing the old approach makes sense. Acked-by: Stefan Agner <stefan.agner@toradex.com> -- Stefan > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- > > Changes in v3: None > Changes in v2: None > > board/toradex/colibri_vf/colibri_vf.c | 16 ---------------- > include/configs/colibri_vf.h | 7 ------- > scripts/config_whitelist.txt | 5 ----- > 3 files changed, 28 deletions(-) > > diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c > index c65ccb3..e65d9c3 100644 > --- a/board/toradex/colibri_vf/colibri_vf.c > +++ b/board/toradex/colibri_vf/colibri_vf.c > @@ -528,22 +528,6 @@ int checkboard(void) > return 0; > } > > -int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) > -{ > - unsigned short usb_pid; > - > - put_unaligned(CONFIG_TRDX_VID, &dev->idVendor); > - > - if (is_colibri_vf61()) > - usb_pid = CONFIG_TRDX_PID_COLIBRI_VF61IT; > - else > - usb_pid = CONFIG_TRDX_PID_COLIBRI_VF50IT; > - > - put_unaligned(usb_pid, &dev->idProduct); > - > - return 0; > -} > - > #ifdef CONFIG_USB_EHCI_VF > int board_ehci_hcd_init(int port) > { > diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h > index 0e622fb..0cd77ff 100644 > --- a/include/configs/colibri_vf.h > +++ b/include/configs/colibri_vf.h > @@ -208,13 +208,6 @@ > #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 > #define CONFIG_EHCI_HCD_INIT_AFTER_RESET > > -/* USB Client Support */ > -#define CONFIG_TRDX_VID 0x1B67 > -#define CONFIG_TRDX_PID_COLIBRI_VF50 0x0016 > -#define CONFIG_TRDX_PID_COLIBRI_VF61 0x0017 > -#define CONFIG_TRDX_PID_COLIBRI_VF61IT 0x0018 > -#define CONFIG_TRDX_PID_COLIBRI_VF50IT 0x0019 > - > /* USB DFU */ > #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024 * 1024) > > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index 3621c91..05fd5be 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -8010,11 +8010,6 @@ CONFIG_TRACE_EARLY_ADDR > CONFIG_TRACE_EARLY_SIZE > CONFIG_TRAILBLAZER > CONFIG_TRATS > -CONFIG_TRDX_PID_COLIBRI_VF50 > -CONFIG_TRDX_PID_COLIBRI_VF50IT > -CONFIG_TRDX_PID_COLIBRI_VF61 > -CONFIG_TRDX_PID_COLIBRI_VF61IT > -CONFIG_TRDX_VID > CONFIG_TSEC > CONFIG_TSEC1 > CONFIG_TSEC1_NAME
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index c65ccb3..e65d9c3 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -528,22 +528,6 @@ int checkboard(void) return 0; } -int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) -{ - unsigned short usb_pid; - - put_unaligned(CONFIG_TRDX_VID, &dev->idVendor); - - if (is_colibri_vf61()) - usb_pid = CONFIG_TRDX_PID_COLIBRI_VF61IT; - else - usb_pid = CONFIG_TRDX_PID_COLIBRI_VF50IT; - - put_unaligned(usb_pid, &dev->idProduct); - - return 0; -} - #ifdef CONFIG_USB_EHCI_VF int board_ehci_hcd_init(int port) { diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 0e622fb..0cd77ff 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -208,13 +208,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET -/* USB Client Support */ -#define CONFIG_TRDX_VID 0x1B67 -#define CONFIG_TRDX_PID_COLIBRI_VF50 0x0016 -#define CONFIG_TRDX_PID_COLIBRI_VF61 0x0017 -#define CONFIG_TRDX_PID_COLIBRI_VF61IT 0x0018 -#define CONFIG_TRDX_PID_COLIBRI_VF50IT 0x0019 - /* USB DFU */ #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024 * 1024) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3621c91..05fd5be 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -8010,11 +8010,6 @@ CONFIG_TRACE_EARLY_ADDR CONFIG_TRACE_EARLY_SIZE CONFIG_TRAILBLAZER CONFIG_TRATS -CONFIG_TRDX_PID_COLIBRI_VF50 -CONFIG_TRDX_PID_COLIBRI_VF50IT -CONFIG_TRDX_PID_COLIBRI_VF61 -CONFIG_TRDX_PID_COLIBRI_VF61IT -CONFIG_TRDX_VID CONFIG_TSEC CONFIG_TSEC1 CONFIG_TSEC1_NAME