summaryrefslogtreecommitdiff
path: root/target/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-08 11:05:54 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-08 11:05:54 +0200
commit73c912bd1b27ab79bd479b84ae333a334d293023 (patch)
treea1abaff1c2d61279fea1ce322a58518f48479b31 /target/config
parent4156b7fd87da172f070dc3deae4d18002ebf1e60 (diff)
rename qemu-sh4 to qemu-sh, to simplify build for all qemu-archs
Diffstat (limited to 'target/config')
-rw-r--r--target/config/Config.in.kernel2
-rw-r--r--target/config/Config.in.qemuopts10
-rw-r--r--target/config/Config.in.runtime2
-rw-r--r--target/config/Config.in.target2
4 files changed, 8 insertions, 8 deletions
diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel
index 15edab364..0d1d06d16 100644
--- a/target/config/Config.in.kernel
+++ b/target/config/Config.in.kernel
@@ -42,7 +42,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
default "qemu-mips64" if ADK_TARGET_SYSTEM_QEMU_MIPS64
default "qemu-ppc" if ADK_TARGET_SYSTEM_QEMU_PPC
default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64
- default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4
+ default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH
default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC
default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64
default "qemu-x86" if ADK_TARGET_SYSTEM_QEMU_X86
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index ffb48946c..0091c7c7d 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -45,14 +45,14 @@ config ADK_TARGET_QEMU_WITH_BLOCK
select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC
select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
- select ADK_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH4
+ select ADK_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH
select ADK_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
endchoice
choice
prompt "Qemu Emulation with graphical output"
-depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_SH4
+depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_SH
config ADK_TARGET_QEMU_WITHOUT_GRAPHIC
boolean "disabled"
@@ -69,12 +69,12 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC
select ADK_KERNEL_INPUT_KEYBOARD
select ADK_KERNEL_INPUT_MOUSE
select ADK_KERNEL_INPUT_MOUSEDEV
- select ADK_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH4
+ select ADK_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH
select ADK_KERNEL_DRM_CIRRUS_QEMU if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
select ADK_KERNEL_MOUSE_PS2 if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
- select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH4
- select ADK_KERNEL_USB_OHCI_HCD_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH4
+ select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH
+ select ADK_KERNEL_USB_OHCI_HCD_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH
endchoice
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index c2d8d6612..348372785 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -120,7 +120,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
default "hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64
default "ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 || ADK_TARGET_SYSTEM_ARM_FM
- default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
+ default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH
default "ttymxc0" if ADK_TARGET_SYSTEM_CUBOX_I
default "ttyS0"
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 247dee8de..4f6874562 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -55,7 +55,7 @@ config ADK_TARGET_CMDLINE
default "console=ttyS0,115200" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
default "console=hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64
default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_QEMU_PPC
- default "console=ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4
+ default "console=ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH
default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_SPARC64
default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
default ""