From 2d8a3559113a0a2514bbb9ae27b0fce44477f323 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 8 Mar 2014 18:30:46 +0100 Subject: add some usb hid stuff for qemu-sh, you _must_ start qemu-sh with -serial null -serial stdio. otherwise no output. thx to aboriginal linux --- target/config/Config.in | 1 + target/linux/config/Config.in.input | 7 +++++-- target/linux/config/Config.in.usb | 16 ++++++++++++++-- target/sh/Makefile | 7 ++++--- 4 files changed, 24 insertions(+), 7 deletions(-) (limited to 'target') diff --git a/target/config/Config.in b/target/config/Config.in index 5c5f1b6fd..9d8a36b49 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -241,6 +241,7 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_KERNEL_INPUT_MOUSE select ADK_KERNEL_INPUT_MOUSEDEV + select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB endchoice diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 17c23b65c..5a01ee1e1 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -9,6 +9,10 @@ config ADK_KERNEL_INPUT default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n +config ADK_KERNEL_USB_HID + boolean + default n + config ADK_KERNEL_HID_LOGITECH boolean default n @@ -113,6 +117,7 @@ depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCH config ADK_KPACKAGE_KMOD_USB_HID prompt "kmod-usb-hid..................... USB keyboard/mouse support" tristate + depends on !ADK_KERNEL_USB_HID select ADK_KERNEL_INPUT select ADK_KERNEL_HID select ADK_KERNEL_HID_GENERIC @@ -122,8 +127,6 @@ config ADK_KPACKAGE_KMOD_USB_HID depends on ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_TARGET_WITH_USB default y if ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_TARGET_SYSTEM_QEMU_SH4 && ADK_TARGET_QEMU_WITH_GRAPHIC - default y if ADK_TARGET_SYSTEM_QEMU_SH4EB && ADK_TARGET_QEMU_WITH_GRAPHIC default n config ADK_KERNEL_LOGITECH_DINOVO diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index b2c750673..f6fd22339 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -1,11 +1,23 @@ menu "USB support" -depends on ADK_TARGET_WITH_USB +depends on ADK_TARGET_WITH_USB || ADK_HARDWARE_QEMU config ADK_KERNEL_USB_SUPPORT boolean config ADK_KERNEL_USB select ADK_KERNEL_USB_SUPPORT + default y if ADK_TARGET_SYSTEM_QEMU_SH4 + default y if ADK_TARGET_SYSTEM_QEMU_SH4EB + boolean + +config ADK_KERNEL_USB_OHCI_HCD + default y if ADK_TARGET_SYSTEM_QEMU_SH4 + default y if ADK_TARGET_SYSTEM_QEMU_SH4EB + boolean + +config ADK_KERNEL_USB_OHCI_HCD_PLATFORM + default y if ADK_TARGET_SYSTEM_QEMU_SH4 + default y if ADK_TARGET_SYSTEM_QEMU_SH4EB boolean config ADK_KERNEL_USB_LIBUSUAL @@ -36,7 +48,6 @@ config ADK_KPACKAGE_KMOD_USB select ADK_KERNEL_USB_SUPPORT depends on !ADK_KERNEL_USB default y if ADK_TARGET_SYSTEM_QEMU_I686 - default y if ADK_TARGET_SYSTEM_QEMU_SH4 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 @@ -108,6 +119,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_QEMU_SH4 + default y if ADK_TARGET_SYSTEM_QEMU_SH4EB default n help The Open Host Controller Interface (OHCI) is a standard for accessing diff --git a/target/sh/Makefile b/target/sh/Makefile index da733acac..3cf65f614 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/sh/boot/zImage +QEMU_ARGS:=${ADK_QEMU_ARGS} -monitor null -serial null -serial stdio ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @@ -18,7 +19,7 @@ ifneq ($(ADK_HARDWARE_QEMU),) @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -28,7 +29,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -37,6 +38,6 @@ imageinstall: createinitramfs @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif -- cgit v1.2.3