rename qemu-sh4 to qemu-sh, to simplify build for all qemu-archs

8 files changed, 15 insertions, 15 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 ""
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 25e6403e9..625f2fdfe 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -187,7 +187,7 @@ config ADK_KERNEL_PATA_PLATFORM
 	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	depends on ADK_TARGET_SYSTEM_QEMU_SH4
+	depends on ADK_TARGET_SYSTEM_QEMU_SH
 	default n
 
 config ADK_KERNEL_PATA_PCMCIA
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index 8ee2b4b30..e0445bb73 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -163,8 +163,8 @@ config ADK_KERNEL_8139CP
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_VENDOR_REALTEK
 	select ADK_KERNEL_MII
-	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_SYSTEM_QEMU_SH4
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_SYSTEM_QEMU_SH
+	default y if ADK_TARGET_SYSTEM_QEMU_SH
 	default n
 	help
 	  RTL8139C+ pci driver
diff --git a/target/sh/systems/qemu-sh4 b/target/sh/systems/qemu-sh
index 0e0dad617..8dea50241 100644
--- a/target/sh/systems/qemu-sh4
+++ b/target/sh/systems/qemu-sh
@@ -1,7 +1,7 @@
-config ADK_TARGET_SYSTEM_QEMU_SH4
+config ADK_TARGET_SYSTEM_QEMU_SH
 	bool "Qemu Emulator"
 	select ADK_sh
-	select ADK_qemu_sh4
+	select ADK_qemu_sh
 	select ADK_CPU_SH4
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
diff --git a/target/sh/systems/toolchain-sh4 b/target/sh/systems/toolchain-sh
index 0675fe71c..3a9fbe6de 100644
--- a/target/sh/systems/toolchain-sh4
+++ b/target/sh/systems/toolchain-sh
@@ -1,7 +1,7 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4
+config ADK_TARGET_SYSTEM_TOOLCHAIN_SH
 	bool "Toolchain only"
 	select ADK_sh
-	select ADK_toolchain_sh4
+	select ADK_toolchain_sh
 	select ADK_CPU_SH4
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ