diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-23 09:54:00 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-23 09:54:00 +0200 |
| commit | df5194ba782f8f999fee47d051bb5b5bded51aff (patch) | |
| tree | c76482aefb5aa3deef1b8d45142b82e56162cf26 /target/sh | |
| parent | 79c026d5ea81ec88c03f4e363c97f0af3670c17f (diff) | |
fix usb keyboard for qemu-system-sh4
Diffstat (limited to 'target/sh')
| -rw-r--r-- | target/sh/Makefile | 15 | ||||
| -rw-r--r-- | target/sh/kernel/qemu-sh | 7 |
2 files changed, 12 insertions, 10 deletions
diff --git a/target/sh/Makefile b/target/sh/Makefile index 12f8d0ce4..201ea1efe 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -8,7 +8,14 @@ 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 + +QEMU_ARGS:=-M r2d +QEMU_ARGS+=${ADK_QEMU_ARGS} +QEMU_ARGS+=-monitor null + +ifeq ($(ADK_TARGET_QEMU_WITH_GRAPHIC),) +QEMU_ARGS+=-serial null -serial stdio +endif ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @@ -19,7 +26,7 @@ ifneq ($(ADK_HARDWARE_QEMU),) @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) @@ -35,7 +42,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} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -44,6 +51,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} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/sh/kernel/qemu-sh b/target/sh/kernel/qemu-sh index dcdf00111..1678d7a51 100644 --- a/target/sh/kernel/qemu-sh +++ b/target/sh/kernel/qemu-sh @@ -1,22 +1,17 @@ CONFIG_SUPERH=y CONFIG_SUPERH32=y CONFIG_CPU_SH4=y -CONFIG_CPU_HAS_PMU=y CONFIG_CPU_SUBTYPE_SH7751R=y CONFIG_MEMORY_START=0x0c000000 -CONFIG_MEMORY_SIZE=0x08000000 +CONFIG_MEMORY_SIZE=0x04000000 CONFIG_29BIT=y CONFIG_VSYSCALL=y -CONFIG_PAGE_SIZE_4KB=y CONFIG_SH_FPU=y CONFIG_SH_RTS7751R2D=y CONFIG_RTS7751R2D_PLUS=y CONFIG_SH_TIMER_TMU=y CONFIG_SH_INTC=y CONFIG_CMDLINE_EXTEND=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_MII=y CONFIG_NET_VENDOR_REALTEK=y CONFIG_8139CP=y CONFIG_SERIAL_SH_SCI=y |