On Mon, Oct 11, 2021 at 04:55:05PM +0200, Ahmad Fatoum wrote:
> Similar to d297e90323f3 ("scripts: omap3-usb-loader: make proper
> use of pkg-config --cflags"), tools using libusb-1.0 should
> include <libusb.h> and not assume its parent directory will be
> found by the search path, regardless of pkg-config.
>
> Also, .gitignore was missing an entry for the new tool and
> hosttools_defconfig should enable all useful host tools.
>
> Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
> ---
> arch/sandbox/configs/hosttools_defconfig | 1 +
> scripts/.gitignore | 1 +
> scripts/rk-usb-loader.c | 2 +-
> 3 files changed, 3 insertions(+), 1 deletion(-)
Applied, thanks
Sascha
>
> diff --git a/arch/sandbox/configs/hosttools_defconfig b/arch/sandbox/configs/hosttools_defconfig
> index 7d3385312488..0b62b648c744 100644
> --- a/arch/sandbox/configs/hosttools_defconfig
> +++ b/arch/sandbox/configs/hosttools_defconfig
> @@ -4,3 +4,4 @@ CONFIG_ARCH_IMX_USBLOADER=y
> CONFIG_MVEBU_HOSTTOOLS=y
> CONFIG_OMAP3_USB_LOADER=y
> CONFIG_OMAP4_HOSTTOOL_USBBOOT=y
> +CONFIG_RK_USB_LOADER=y
> diff --git a/scripts/.gitignore b/scripts/.gitignore
> index cf645ec74661..bc6e5dbc43df 100644
> --- a/scripts/.gitignore
> +++ b/scripts/.gitignore
> @@ -31,6 +31,7 @@ omap4_usbboot
> omap4_usbboot-target
> omap3-usb-loader
> omap3-usb-loader-target
> +rk-usb-loader
> mips-relocs
> rsatoc
> stm32image
> diff --git a/scripts/rk-usb-loader.c b/scripts/rk-usb-loader.c
> index 627af7259ed0..c742023c60d9 100644
> --- a/scripts/rk-usb-loader.c
> +++ b/scripts/rk-usb-loader.c
> @@ -25,7 +25,7 @@
> #include <sys/types.h>
> #include <sys/stat.h>
> #include <fcntl.h>
> -#include <libusb-1.0/libusb.h>
> +#include <libusb.h>
>
> #include "../common.h"
> #include "../common.c"
> --
> 2.30.2
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
