Eric Lee / smarc-uboot | Embedian Git Server

Commit a6b08c96771014cf048d0eb3a4fb66cf45968afb

Authored by Philipp Tomsich 2017-06-06 21:42:28 +0800

Committed by Simon Glass 2017-06-08 11:12:52 +0800

rockchip: rk3328: don't implement usb_gadget_handle_interrupts twice

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>
Acked-by: Simon Glass <sjg@chromium.org>

Showing 1 changed file with 0 additions and 5 deletions Side-by-side Diff

board/rockchip/evb_rk3328/evb-rk3328.c

board/rockchip/evb_rk3328/evb-rk3328.c

Diff comments View file @ a6b08c9

...	...	@@ -31,11 +31,6 @@
31	31	return 0;
32	32	}
33	33
34		-int usb_gadget_handle_interrupts(void)
35		-{
36		- return 0;
37		-}
38		-
39	34	int board_usb_init(int index, enum usb_init_type init)
40	35	{
41	36	return 0;