Home Explore Help
Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 1 Pull Requests 0 Wiki
Browse Source

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

Waldemar Brodkorb 10 years ago
parent
4156b7fd87
commit
73c912bd1b
8 changed files with 15 additions and 15 deletions
Split View Show Diff Stats
  1. 1 1
      target/config/Config.in.kernel
  2. 5 5
      target/config/Config.in.qemuopts
  3. 1 1
      target/config/Config.in.runtime
  4. 1 1
      target/config/Config.in.target
  5. 1 1
      target/linux/config/Config.in.block
  6. 2 2
      target/linux/config/Config.in.ethernet
  7. 2 2
      target/sh/systems/qemu-sh
  8. 2 2
      target/sh/systems/toolchain-sh

+ 1 - 1
target/config/Config.in.kernel
View File 

@@ -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

+ 5 - 5
target/config/Config.in.qemuopts
View File 

@@ -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

+ 1 - 1
target/config/Config.in.runtime
View File 

@@ -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"

+ 1 - 1
target/config/Config.in.target
View File 

@@ -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 ""

+ 1 - 1
target/linux/config/Config.in.block
View File 

@@ -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

+ 2 - 2
target/linux/config/Config.in.ethernet
View File 

@@ -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

+ 2 - 2
target/sh/systems/qemu-sh4 → target/sh/systems/qemu-sh
View File 

@@ -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

+ 2 - 2
target/sh/systems/toolchain-sh4 → target/sh/systems/toolchain-sh
View File 

@@ -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