| Message ID | 1496756553-19901-4-git-send-email-philipp.tomsich@theobroma-systems.com |
|---|---|
| State | Accepted |
| Commit | a6b08c96771014cf048d0eb3a4fb66cf45968afb |
| Delegated to: | Simon Glass |
| Headers | show |
On 6 June 2017 at 07:42, Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote: > The usb_gadget_handle_interrupts()-function is already implemented by > drivers/usb/gadget/dwc2_udc_otg.c, so we need to avoid defining it > in the evb-rk3328.c board-specific file. > > This change fixes the following build error (from buildman): > drivers/usb/gadget/built-in.o: In function `usb_gadget_handle_interrupts': > build/../drivers/usb/gadget/dwc2_udc_otg.c:850: multiple definition of `usb_gadget_handle_interrupts' > board/rockchip/evb_rk3328/built-in.o:build/../board/rockchip/evb_rk3328/evb-rk3328.c:37: first defined here > make[1]: *** [u-boot] Error 1 > > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > > --- > > Changes in v2: > - (new patch) fix a multiple definition of usb_gadget_handle_interrupts > for the RK3328 EVB in evb-rk3328.c to fix a buildman failure for > u-boot-rockchip/master@2b19b2f > > board/rockchip/evb_rk3328/evb-rk3328.c | 5 ----- > 1 file changed, 5 deletions(-) > Acked-by: Simon Glass <sjg@chromium.org>
On 6 June 2017 at 07:42, Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote: > The usb_gadget_handle_interrupts()-function is already implemented by > drivers/usb/gadget/dwc2_udc_otg.c, so we need to avoid defining it > in the evb-rk3328.c board-specific file. > > This change fixes the following build error (from buildman): > drivers/usb/gadget/built-in.o: In function `usb_gadget_handle_interrupts': > build/../drivers/usb/gadget/dwc2_udc_otg.c:850: multiple definition of `usb_gadget_handle_interrupts' > board/rockchip/evb_rk3328/built-in.o:build/../board/rockchip/evb_rk3328/evb-rk3328.c:37: first defined here > make[1]: *** [u-boot] Error 1 > > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > > --- > > Changes in v2: > - (new patch) fix a multiple definition of usb_gadget_handle_interrupts > for the RK3328 EVB in evb-rk3328.c to fix a buildman failure for > u-boot-rockchip/master@2b19b2f > > board/rockchip/evb_rk3328/evb-rk3328.c | 5 ----- > 1 file changed, 5 deletions(-) > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip, thanks!
diff --git a/board/rockchip/evb_rk3328/evb-rk3328.c b/board/rockchip/evb_rk3328/evb-rk3328.c index a7895cb..0a26ed5 100644 --- a/board/rockchip/evb_rk3328/evb-rk3328.c +++ b/board/rockchip/evb_rk3328/evb-rk3328.c @@ -31,11 +31,6 @@ int dram_init_banksize(void) return 0; } -int usb_gadget_handle_interrupts(void) -{ - return 0; -} - int board_usb_init(int index, enum usb_init_type init) { return 0;
The usb_gadget_handle_interrupts()-function is already implemented by drivers/usb/gadget/dwc2_udc_otg.c, so we need to avoid defining it in the evb-rk3328.c board-specific file. This change fixes the following build error (from buildman): drivers/usb/gadget/built-in.o: In function `usb_gadget_handle_interrupts': build/../drivers/usb/gadget/dwc2_udc_otg.c:850: multiple definition of `usb_gadget_handle_interrupts' board/rockchip/evb_rk3328/built-in.o:build/../board/rockchip/evb_rk3328/evb-rk3328.c:37: first defined here make[1]: *** [u-boot] Error 1 Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> --- Changes in v2: - (new patch) fix a multiple definition of usb_gadget_handle_interrupts for the RK3328 EVB in evb-rk3328.c to fix a buildman failure for u-boot-rockchip/master@2b19b2f board/rockchip/evb_rk3328/evb-rk3328.c | 5 ----- 1 file changed, 5 deletions(-)