summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-02-09 20:01:11 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-02-10 18:09:53 +0100
commit03d89943378949beb126430cf7df50a1706da63b (patch)
treea299101490662a73c972b799e6caee458db9782a /rules
parentaad5d74db2d2606d11029255d859729212bc6b72 (diff)
downloadptxdist-03d89943378949beb126430cf7df50a1706da63b.tar.gz
ptxdist-03d89943378949beb126430cf7df50a1706da63b.tar.xz
usb-modeswitch: fix building without jim
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r--rules/usb-modeswitch.in15
-rw-r--r--rules/usb-modeswitch.make4
2 files changed, 13 insertions, 6 deletions
diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in
index 28659915a..dc6105d92 100644
--- a/rules/usb-modeswitch.in
+++ b/rules/usb-modeswitch.in
@@ -4,22 +4,29 @@ menuconfig USB_MODESWITCH
tristate
prompt "usb-modeswitch "
select LIBUSB
- select JIMTCL if USB_MODESWITCH_UDEV_HELPER || USB_MODESWITCH_SYSTEMD_UNIT
- select HOST_JIMTCL if USB_MODESWITCH_UDEV_HELPER || USB_MODESWITCH_SYSTEMD_UNIT
+ select JIMTCL if USB_MODESWITCH_JIM
+ select HOST_JIMTCL if USB_MODESWITCH_JIM
help
USB_ModeSwitch is (surprise!) a mode switching tool
for controlling 'multi-mode' USB devices.
if USB_MODESWITCH
+config USB_MODESWITCH_JIM
+ bool
+
config USB_MODESWITCH_UDEV_HELPER
- bool "install udev helper"
+ bool
+ prompt "install udev helper"
default y
+ select USB_MODESWITCH_JIM
depends on UDEV
config USB_MODESWITCH_SYSTEMD_UNIT
- bool "install systemd unit file"
+ bool
+ prompt "install systemd unit file"
default y
+ select USB_MODESWITCH_JIM
depends on SYSTEMD
endif
diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index 4934d72c0..5c91bfd9b 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -38,10 +38,10 @@ USB_MODESWITCH_MAKE_ENV := \
HOST_TCL=$(PTXCONF_SYSROOT_HOST)/usr/bin/jimsh
USB_MODESWITCH_MAKE_OPT := \
$(CROSS_ENV_PROGS) \
- shared
+ $(call ptx/ifdef,PTXCONF_USB_MODESWITCH_JIM,shared,script)
USB_MODESWITCH_INSTALL_OPT := \
UDEVDIR=$(USB_MODESWITCH_PKGDIR)/usr/lib/udev \
- install-shared
+ $(call ptx/ifdef,PTXCONF_USB_MODESWITCH_JIM,install-shared,install-script)
# ----------------------------------------------------------------------------
# Install