scripts/omap4_usbboot: use libusb

PATCH In review Vicente Bergas 2 participants 2 messages Jan 11, 2017 – Jan 13, 2017 Kbuild

lore

Share & tools

lore

Vicente Bergas

author

2017-01-11 19:29 UTC #0 lore raw

PATCH 1/1 scripts/omap4_usbboot: use libusb

Signed-off-by Vicente Bergas <[email protected]>

---
 scripts/.gitignore                          |   1 +
 scripts/Makefile                            |   4 +-
 scripts/{omap4_usbboot => }/omap4_usbboot.c |  78 ++++--
 scripts/omap4_usbboot/.gitignore            |   1 -
 scripts/omap4_usbboot/Makefile              |   5 -
 scripts/omap4_usbboot/usb.h                 |  61 -----
 scripts/omap4_usbboot/usb_linux.c           | 397 ----------------------------
 7 files changed, 55 insertions(+), 492 deletions(-)
 rename scripts/{omap4_usbboot => }/omap4_usbboot.c (87%)
 delete mode 100644 scripts/omap4_usbboot/.gitignore
 delete mode 100644 scripts/omap4_usbboot/Makefile
 delete mode 100644 scripts/omap4_usbboot/usb.h
 delete mode 100644 scripts/omap4_usbboot/usb_linux.c

scripts/.gitignore +1 -0

index 533bffd97..2a9ae6bdc 100644
@@ -25,3 +25,4 @@ mk-am35xx-spi-image
 mxsimage
 mxsboot
 mxs-usb-loader
+omap4_usbboot

scripts/Makefile +3 -1

index a5c16b2f3..7f2527d1c 100644
@@ -28,9 +28,11 @@ hostprogs-$(CONFIG_ARCH_MXS_USBLOADER)  += mxs-usb-loader
 HOSTCFLAGS_omap3-usb-loader.o = `pkg-config --cflags libusb-1.0`
 HOSTLOADLIBES_omap3-usb-loader  = `pkg-config --libs libusb-1.0`
 hostprogs-$(CONFIG_OMAP3_USB_LOADER)  += omap3-usb-loader
+HOSTCFLAGS_omap4_usbboot.o = `pkg-config --cflags libusb-1.0`
+HOSTLOADLIBES_omap4_usbboot = -lpthread `pkg-config --libs libusb-1.0`
+hostprogs-$(CONFIG_OMAP4_USBBOOT) += omap4_usbboot
 
 subdir-y			+= mod
-subdir-$(CONFIG_OMAP4_USBBOOT)	+= omap4_usbboot
 subdir-$(CONFIG_ARCH_IMX)	+= imx
 subdir-$(CONFIG_X86)		+= setupmbr
 subdir-$(CONFIG_DTC)		+= dtc

scripts/omap4_usbboot.c renamed from scripts/omap4_usbboot/omap4_usbboot.c +51 ~~-27~~

149 lines not on this page · raw message

scripts/omap4_usbboot/.gitignore deleted +0 -1

deleted file mode 100644
index 1975a2172..000000000
@@ -1 +0,0 @@
-omap4_usbboot

scripts/omap4_usbboot/Makefile deleted +0 -5

deleted file mode 100644
index af6444b0e..000000000
@@ -1,5 +0,0 @@
-HOSTLOADLIBES_omap4_usbboot = -lpthread
-omap4_usbboot-objs := usb_linux.o omap4_usbboot.o
-hostprogs-$(CONFIG_OMAP4_USBBOOT) += omap4_usbboot
-
-always	:= $(hostprogs-y)

scripts/omap4_usbboot/usb.h deleted +0 ~~-61~~

61 lines not on this page · raw message

scripts/omap4_usbboot/usb_linux.c deleted +0 ~~-397~~

397 lines not on this page · raw message

Signature · 7 lines

2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Sascha Hauer

2017-01-13 07:00 UTC #1 lore raw

Quoted 15 lines · Vicente Bergas

Signed-off-by Vicente Bergas <[email protected]>

---
 scripts/.gitignore                          |   1 +
 scripts/Makefile                            |   4 +-
 scripts/{omap4_usbboot => }/omap4_usbboot.c |  78 ++++--
 scripts/omap4_usbboot/.gitignore            |   1 -
 scripts/omap4_usbboot/Makefile              |   5 -
 scripts/omap4_usbboot/usb.h                 |  61 -----
 scripts/omap4_usbboot/usb_linux.c           | 397 ----------------------------
 7 files changed, 55 insertions(+), 492 deletions(-)
 rename scripts/{omap4_usbboot => }/omap4_usbboot.c (87%)
 delete mode 100644 scripts/omap4_usbboot/.gitignore
 delete mode 100644 scripts/omap4_usbboot/Makefile
 delete mode 100644 scripts/omap4_usbboot/usb.h
 delete mode 100644 scripts/omap4_usbboot/usb_linux.c

Nice cleanup. It's always easy to apply patches with so many deleted lines ;)
Applied, thanks

Sascha

Signature · 9 lines

Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox