refactor kernel mini.config.

We do not need to manually set mini.config file anymore.
Every target system, even Qemu emulating different models get
it its own. Cleaner and simpler to add new targets.

30 files changed, 190 insertions, 235 deletions

diff --git a/target/Makefile b/target/Makefile
index a2934682e..d6cfa0bf8 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -29,9 +29,9 @@ ifeq ($(ADK_TARGET_KERNEL_CUSTOMISING),y)
 config-prepare: $(ADK_TOPDIR)/.config
 	@PATH='$(HOST_PATH)' sed -n '/^ADK_KERNEL/s//CONFIG/p' $(ADK_TOPDIR)/.config \
 	    >$(BUILD_DIR)/.kernelconfig.kernel
-	@if [ -f $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_KERNEL_MINICONFIG) ];then \
+	@if [ -f $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_SYSTEM) ];then \
 		cat $(ADK_TOPDIR)/target/linux/kernel.config \
-		    $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_KERNEL_MINICONFIG) > $(BUILD_DIR)/.kernelconfig.board; \
+		    $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_SYSTEM) > $(BUILD_DIR)/.kernelconfig.board; \
 	else \
 		echo "no miniconfig found for target system"; \
 		exit 1; \
@@ -57,7 +57,7 @@ ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_VGA),y)
 	$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE)"#' \
 		$(BUILD_DIR)/.kernelconfig.board
 endif
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_M68K),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_M68K_Q800)$(ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208),y)
 	@$(SED) 's#^\(CONFIG_.*BOOTPARAM_STRING="\)\(.*\)"#\1\2 ro $(FS_CMDLINE)"#' \
 		$(BUILD_DIR)/.kernelconfig.board
 endif
@@ -103,9 +103,9 @@ endif
 	@-rm -f $(BUILD_DIR)/.kernelconfig.tmp
 else
 config-prepare: $(ADK_TOPDIR)/.config
-	@if [ -f $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_KERNEL_MINICONFIG) ];then \
+	@if [ -f $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_SYSTEM) ];then \
 		cat $(ADK_TOPDIR)/target/linux/kernel.config \
-		    $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_KERNEL_MINICONFIG) > $(BUILD_DIR)/.kernelconfig.board; \
+		    $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_SYSTEM) > $(BUILD_DIR)/.kernelconfig.board; \
 	else \
 		echo "no miniconfig found for target system"; \
 		exit 1; \
diff --git a/target/arm/Makefile b/target/arm/Makefile
index a86a4ac2e..3bc254ca6 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -14,16 +14,16 @@ KERNEL:=$(LINUX_DIR)/arch/arm/boot/uImage
 endif
 
 QEMU_ARGS:=${ADK_QEMU_ARGS}
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y)
 QEMU_ARGS+=-M spitz
 endif
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_TERRIER),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER),y)
 QEMU_ARGS+=-M terrier
 endif
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y)
 QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111
 endif
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y)
 QEMU_ARGS+=-M vexpress-a9 -cpu cortex-a9 -m 256 -net user -net nic,model=lan9118 -dtb $(FW_DIR)/vexpress-v2p-ca9.dtb
 endif
 ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
@@ -34,7 +34,7 @@ endif
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB)$(ADK_TARGET_QEMU_ARM_MODEL_TERRIER)$(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER)$(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -131,7 +131,7 @@ kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 
 dtb-install:
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y)
 	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
 		dtbs $(MAKE_TRACE)
 endif
diff --git a/target/arm/systems/qemu-arm b/target/arm/systems/qemu-arm
deleted file mode 100644
index 2e3d17dd9..000000000
--- a/target/arm/systems/qemu-arm
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_ARM
-	bool "Qemu Emulator"
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_ZIMAGE
-	help
-	  Qemu Emulator for ARM architecture.
-
diff --git a/target/arm/systems/qemu-arm-spitz b/target/arm/systems/qemu-arm-spitz
new file mode 100644
index 000000000..4cabc8a66
--- /dev/null
+++ b/target/arm/systems/qemu-arm-spitz
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
+	bool "Qemu Emulator (Spitz PDA)"
+	select ADK_CPU_XSCALE
+	select ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	  Qemu Emulator for ARM architecture (Spitz PDA).
+
diff --git a/target/arm/systems/qemu-arm-terrier b/target/arm/systems/qemu-arm-terrier
new file mode 100644
index 000000000..e09e4c284
--- /dev/null
+++ b/target/arm/systems/qemu-arm-terrier
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
+	bool "Qemu Emulator (Terrier PDA)"
+	select ADK_CPU_XSCALE
+	select ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	  Qemu Emulator for ARM architecture (Terrier PDA).
+
diff --git a/target/arm/systems/qemu-arm-versatilepb b/target/arm/systems/qemu-arm-versatilepb
new file mode 100644
index 000000000..e55a9681f
--- /dev/null
+++ b/target/arm/systems/qemu-arm-versatilepb
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
+	bool "Qemu Emulator (Versatile/PB)"
+	select ADK_CPU_ARM926EJ_S
+	select ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	  Qemu Emulator for ARM architecture (Versatile/PB).
+
diff --git a/target/arm/systems/qemu-arm-vexpress-a9 b/target/arm/systems/qemu-arm-vexpress-a9
new file mode 100644
index 000000000..2b1f0679a
--- /dev/null
+++ b/target/arm/systems/qemu-arm-vexpress-a9
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
+	bool "Qemu Emulator (Vexpress A9)"
+	select ADK_CPU_CORTEX_A9
+	select ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	  Qemu Emulator for ARM architecture (Vexpress A9).
+
diff --git a/target/config/Config.in.kernelcfg b/target/config/Config.in.kernelcfg
index 458405198..3a654bfdb 100644
--- a/target/config/Config.in.kernelcfg
+++ b/target/config/Config.in.kernelcfg
@@ -16,57 +16,3 @@ config ADK_TARGET_KERNEL_DEFCONFIG
 	string
 	depends on ADK_TARGET_KERNEL_USE_DEFCONFIG
 
-config ADK_TARGET_KERNEL_MINICONFIG
-	string
-	depends on ADK_TARGET_KERNEL_USE_MINICONFIG
-	default "arm-fm" if ADK_TARGET_SYSTEM_ARM_FM
-	default "qemu-cris" if ADK_TARGET_SYSTEM_QEMU_CRIS
-	default "qemu-microblaze-s3adsp1800" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	default "qemu-microblaze-ml605" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
-	default "qemu-aarch64" if ADK_TARGET_SYSTEM_QEMU_AARCH64
-	default "qemu-arm-versatilepb" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	default "qemu-arm-vexpress-a9" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
-	default "qemu-arm-spitz" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default "qemu-arm-terrier" if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
-	default "qemu-mips" if ADK_TARGET_SYSTEM_QEMU_MIPS
-	default "qemu-mips64" if ADK_TARGET_SYSTEM_QEMU_MIPS64
-	default "qemu-ppc-mac99" if ADK_TARGET_QEMU_PPC_MACPPC
-	default "qemu-ppc-bamboo" if ADK_TARGET_QEMU_PPC_BAMBOO
-	default "qemu-virtex-ml507" if ADK_TARGET_QEMU_PPC_VIRTEX_ML507
-	default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64
-	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
-	default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64
-	default "qemu-xtensa" if ADK_TARGET_SYSTEM_QEMU_XTENSA
-	default "qemu-alpha" if ADK_TARGET_SYSTEM_QEMU_ALPHA
-	default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
-	default "vbox-x86" if ADK_TARGET_SYSTEM_VBOX_X86
-	default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
-	default "solidrun-imx6" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default "raspberry-pi2" if ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default "linksys-nslu2" if ADK_TARGET_SYSTEM_LINKSYS_NSLU2
-	default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default "mikrotik-rb4xx" if ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	default "mikrotik-rb532" if ADK_TARGET_SYSTEM_MIKROTIK_RB532
-	default "dragino-ms14s" if ADK_TARGET_SYSTEM_DRAGINO_MS14S
-	default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC
-	default "pcengines-apu" if ADK_TARGET_SYSTEM_PCENGINES_APU
-	default "atmel-ngw100" if ADK_TARGET_SYSTEM_ATMEL_NGW100
-	default "apple-macmini" if ADK_TARGET_SYSTEM_APPLE_MACMINI
-	default "sun-voyager" if ADK_TARGET_SYSTEM_SUN_VOYAGER
-	default "banana-pro" if ADK_TARGET_SYSTEM_BANANA_PRO
-	default "xilinx-kintex7" if ADK_TARGET_SYSTEM_XILINX_KINTEX7
-	default "pcengines-alix" if ADK_TARGET_SYSTEM_PCENGINES_ALIX
-	default "kinetis-k70" if ADK_TARGET_SYSTEM_KINETIS_K70
-	default "sim-bfin" if ADK_TARGET_SYSTEM_SIM_BFIN
-	default "sim-h8300h" if ADK_TARGET_SYSTEM_SIM_H8300H
-	default "qemu-m68k-mcf5208" if ADK_TARGET_QEMU_M68K_MCF5208
-	default "qemu-m68k-q800" if ADK_TARGET_QEMU_M68K_Q800
-	default "imgtec-ci20" if ADK_TARGET_SYSTEM_IMGTEC_CI20
-	default "qemu-metag" if ADK_TARGET_SYSTEM_QEMU_METAG
-	default "qemu-or1k" if ADK_TARGET_SYSTEM_QEMU_OR1K
-	default "beaglebone-black" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu
deleted file mode 100644
index f47f5fa62..000000000
--- a/target/config/Config.in.qemu
+++ /dev/null
@@ -1,70 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-choice
-prompt "Qemu PPC Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_PPC
-
-config ADK_TARGET_QEMU_PPC_BAMBOO
-	bool "Bamboo PPC"
-	select ADK_CPU_PPC_440
-	select ADK_TARGET_SOFT_FLOAT
-
-config ADK_TARGET_QEMU_PPC_MACPPC
-	bool "Mac99 PPC"
-	select ADK_CPU_PPC
-	select ADK_TARGET_CPU_WITH_FPU
-
-endchoice
-
-choice
-prompt "Qemu M68K Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_M68K
-
-config ADK_TARGET_QEMU_M68K_Q800
-	bool "M68K Q800"
-	select ADK_CPU_68040
-
-config ADK_TARGET_QEMU_M68K_MCF5208
-	bool "Coldfire MCF5208"
-	select ADK_CPU_CF_5208
-	select ADK_TARGET_BINFMT_FLAT
-	select ADK_TARGET_UCLINUX
-
-endchoice
-
-choice
-prompt "Qemu MICROBLAZE Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
-
-config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	bool "Xilinx Spartan S3ADSP1800"
-
-config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
-	bool "Xilinx ML605"
-
-endchoice
-
-choice
-prompt "Qemu ARM Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_ARM
-
-config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
-	bool "ARM Ltd. Versatile Express with Cortex-A9"
-	select ADK_CPU_CORTEX_A9
-
-config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	bool "ARM Ltd. Versatile/PB with ARM926EJ-S"
-	select ADK_CPU_ARM926EJ_S
-
-config ADK_TARGET_QEMU_ARM_MODEL_TERRIER
-	bool "Xscale PXA270 Terrier PDA with XSCALE"
-	select ADK_CPU_XSCALE
-	select ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
-
-config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	bool "Xscale PXA270 Spitz PDA with XSCALE"
-	select ADK_CPU_XSCALE
-	select ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
-
-endchoice
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index cec56dc32..b75facf75 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -10,7 +10,7 @@ config ADK_QEMU_ARGS
 config ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	bool
 	select ADK_TARGET_WITH_VGA
-	depends on ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
+	depends on ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 
 choice 
 prompt "Bootloader"
@@ -27,14 +27,15 @@ endchoice
 
 choice
 prompt "Qemu Emulation with storage device"
-depends on ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB \
-	|| ADK_TARGET_QEMU_ARM_MODEL_TERRIER \
-	|| ADK_TARGET_QEMU_ARM_MODEL_SPITZ \
-	|| ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 \
-	|| ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 \
+depends on ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \
+	|| ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER \
+	|| ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ \
+	|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
+	|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
 	|| ADK_TARGET_SYSTEM_QEMU_MIPS \
 	|| ADK_TARGET_SYSTEM_QEMU_MIPS64 \
-	|| ADK_TARGET_SYSTEM_QEMU_PPC \
+	|| ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC \
+	|| ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
 	|| ADK_TARGET_SYSTEM_QEMU_PPC64 \
 	|| ADK_TARGET_SYSTEM_QEMU_SH \
 	|| ADK_TARGET_SYSTEM_QEMU_SPARC \
@@ -51,21 +52,27 @@ config ADK_TARGET_QEMU_WITHOUT_BLOCK
 config ADK_TARGET_QEMU_WITH_BLOCK
 	bool "enabled"
 	select ADK_TARGET_WITH_BLOCK
-	select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	select ADK_KERNEL_ATA_PIIX if ADK_TARGET_SYSTEM_QEMU_MIPS || ADK_TARGET_SYSTEM_QEMU_MIPS64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
-	select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC
+	select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
+	select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
+					|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
+	select ADK_KERNEL_ATA_PIIX if ADK_TARGET_SYSTEM_QEMU_MIPS \
+					|| ADK_TARGET_SYSTEM_QEMU_MIPS64 \
+					|| ADK_TARGET_SYSTEM_QEMU_X86 \
+					|| ADK_TARGET_SYSTEM_QEMU_X86_64
+	select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
+					|| ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
 	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_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64
 	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
+	select ADK_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \
+					|| ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 
 endchoice
 
 choice
 prompt "Qemu Emulation with graphical output"
-depends on ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 \
+depends on ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \
 	|| ADK_TARGET_SYSTEM_QEMU_SH \
 	|| ADK_TARGET_SYSTEM_QEMU_X86_64 \
 	|| ADK_TARGET_SYSTEM_QEMU_X86
@@ -86,7 +93,7 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_INPUT_MOUSE
 	select ADK_KERNEL_INPUT_MOUSEDEV
-	select ADK_KERNEL_PLAT_VERSATILE_CLCD if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
+	select ADK_KERNEL_PLAT_VERSATILE_CLCD if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
 	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
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 133c426e5..ec89dcc01 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -228,8 +228,11 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 		|| ADK_TARGET_QEMU \
 		|| ADK_TARGET_SIM
 	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 || ADK_TARGET_SYSTEM_QEMU_AARCH64
+	default "ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
+	default "ttyAMA0" if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \
+				|| ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \
+				|| ADK_TARGET_SYSTEM_ARM_FM \
+				|| ADK_TARGET_SYSTEM_QEMU_AARCH64
 	default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH
 	default "ttySC0" if ADK_TARGET_SYSTEM_SIM_H8300H
 	default "ttymxc0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 77eec48c3..ce74c4bba 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -57,7 +57,9 @@ config ADK_TARGET_ROOTFS_SQUASHFS
 	select ADK_HOST_NEED_SQUASHFS
 	select ADK_HOST_NEED_QEMU if ADK_TARGET_QEMU
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU
-	depends on ADK_TARGET_WITH_MTD || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
+	depends on ADK_TARGET_WITH_MTD \
+		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
+		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
 	help
 	  highly compressed read-only filesystem for MTD flash systems.
 
@@ -66,7 +68,9 @@ config ADK_TARGET_ROOTFS_JFFS2
 	select ADK_KERNEL_JFFS2_FS
 	select ADK_HOST_NEED_MTD_UTILS
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU
-	depends on ADK_TARGET_WITH_MTD || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
+	depends on ADK_TARGET_WITH_MTD \
+		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
+		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
 	help
 	  compressed read-write filesystem for MTD flash systems.
 
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 31b6bc299..5e5bf4d19 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -200,7 +200,7 @@ config ADK_KERNEL_PATA_MACIO
 	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	depends on ADK_TARGET_SYSTEM_QEMU_PPC
+	depends on ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
 	
 config ADK_KERNEL_PATA_PLATFORM
 	tristate "PATA platform driver"
@@ -266,7 +266,9 @@ config ADK_KERNEL_PATA_PXA
 	select ADK_KERNEL_BLK_DEV_SD
 	select ADK_KERNEL_PATA_PCMCIA
 	select ADK_KERNEL_PCMCIA_PXA2XX
-	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS || ADK_TARGET_QEMU_ARM_MODEL_TERRIER || ADK_TARGET_QEMU_ARM_MODEL_SPITZ
+	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS \
+		|| ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER \
+		|| ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default n
 	help
@@ -276,7 +278,7 @@ endmenu
 
 menu "SCSI driver support"
 depends on ADK_TARGET_WITH_SCSI || \
-	ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || \
+	ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB || \
 	ADK_TARGET_SYSTEM_QEMU_PPC64 || \
 	ADK_TARGET_SYSTEM_QEMU_SPARC
 
@@ -288,7 +290,7 @@ config ADK_KERNEL_SCSI_SYM53C8XX_2
 	select ADK_KERNEL_SCSI_LOWLEVEL
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	depends on ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
+	depends on ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
 
 config ADK_KERNEL_SCSI_IBMVSCSI
 	tristate "IBM VSCSI support"
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index 0219f4ef9..7d54775a5 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -74,10 +74,10 @@ config ADK_KERNEL_FEC
 	select ADK_KERNEL_NET_VENDOR_FREESCALE
 	select ADK_KERNEL_AT803X_PHY
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 || \
-		   ADK_TARGET_QEMU_M68K_MCF5208 || \
+		   ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 || \
 		   ADK_TARGET_SYSTEM_KINETIS_K70
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	default y if ADK_TARGET_QEMU_M68K_MCF5208
+	default y if ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	default y if ADK_TARGET_SYSTEM_KINETIS_K70
 	default n
 	help
@@ -105,8 +105,8 @@ config ADK_KERNEL_SMC91X
 	tristate "SMC91X ethernet driver"
 	select ADK_KERNEL_NET_VENDOR_SMSC
 	select ADK_KERNEL_GPIOLIB
-	depends on ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	default y if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
+	depends on ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
 	default y if ADK_TARGET_SYSTEM_ARM_FM
 	default n
 	help
@@ -115,9 +115,9 @@ config ADK_KERNEL_SMC91X
 config ADK_KERNEL_SMSC911X
 	tristate "SMC911X ethernet driver"
 	select ADK_KERNEL_NET_VENDOR_SMSC
-	default y if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
 	default n
-	depends on ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
+	depends on ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
 	help
  	  SMC911X ethernet driver
 
@@ -136,8 +136,8 @@ config ADK_KERNEL_VIA_RHINE
 config ADK_KERNEL_XILINX_AXI_EMAC
 	tristate "Xilinx AXI ethernet driver"
 	select ADK_KERNEL_NET_VENDOR_XILINX
-	depends on ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
-	default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
+	depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
+	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
 	default n
 	help
 	  Xilinx AXI ethernet driver
@@ -145,8 +145,8 @@ config ADK_KERNEL_XILINX_AXI_EMAC
 config ADK_KERNEL_XILINX_LL_TEMAC
 	tristate "Xilinx Temac ethernet driver"
 	select ADK_KERNEL_NET_VENDOR_XILINX
-	depends on ADK_TARGET_QEMU_PPC_VIRTEX_ML507
-	default y if ADK_TARGET_QEMU_PPC_VIRTEX_ML507
+	depends on ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507
+	default y if ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507
 	default n
 	help
 	  Xilinx Temac ethernet driver
@@ -154,8 +154,8 @@ config ADK_KERNEL_XILINX_LL_TEMAC
 config ADK_KERNEL_XILINX_EMACLITE
 	tristate "Xilinx Emaclite ethernet driver"
 	select ADK_KERNEL_NET_VENDOR_XILINX
-	depends on ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
+	depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
+	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
 	default n
 	help
 	  Xilinx Emaclite ethernet driver
@@ -220,8 +220,8 @@ config ADK_KERNEL_E1000
 		ADK_TARGET_SYSTEM_QEMU_X86_64 || \
 		ADK_TARGET_SYSTEM_QEMU_MIPS || \
 		ADK_TARGET_SYSTEM_QEMU_MIPS64 || \
-		ADK_TARGET_QEMU_PPC_MACPPC || \
-		ADK_TARGET_QEMU_PPC_BAMBOO || \
+		ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC || \
+		ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO || \
 		ADK_TARGET_SYSTEM_QEMU_ALPHA || \
 		ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -229,8 +229,8 @@ config ADK_KERNEL_E1000
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64
-	default y if ADK_TARGET_QEMU_PPC_MACPPC
-	default y if ADK_TARGET_QEMU_PPC_BAMBOO
+	default y if ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
+	default y if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO
 	default y if ADK_TARGET_SYSTEM_QEMU_ALPHA
 	default y if ADK_TARGET_VBOX
 	default n
@@ -303,8 +303,8 @@ config ADK_KERNEL_ETRAX_ETHERNET
 config ADK_KERNEL_MACSONIC
 	bool "MAC sonic ethernet driver"
 	select ADK_KERNEL_NET_VENDOR_NATSEMI
-	depends on ADK_TARGET_QEMU_M68K_Q800
-	default y if ADK_TARGET_QEMU_M68K_Q800
+	depends on ADK_TARGET_SYSTEM_QEMU_M68K_Q800
+	default y if ADK_TARGET_SYSTEM_QEMU_M68K_Q800
 	default n
 
 config ADK_KERNEL_STMMAC_ETH
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index eb4e8e776..d39ac114b 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -82,7 +82,8 @@ config ADK_KERNEL_MTD_M25P80
 	select ADK_KERNEL_MTD_OF_PARTS
 	select ADK_KERNEL_SPI
 	select ADK_KERNEL_SPI_MASTER
-	depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
+	depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
+		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
 	default n
 
 config ADK_KERNEL_MTD_NAND_PLATFORM
@@ -103,9 +104,10 @@ config ADK_KERNEL_MTD_NAND_PLATFORM
 
 config ADK_TARGET_MTD_SIZE
 	int
-	depends on ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
-	default "16777216" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	default "33554432" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
+	depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
+		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
+	default "16777216" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
+	default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
 	default "0"
 
 endmenu
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 928053411..91ab6fcd1 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -249,11 +249,11 @@ config ADK_KERNEL_FB_PXA
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE_ROTATION
 	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS \
-		|| ADK_TARGET_QEMU_ARM_MODEL_TERRIER \
-		|| ADK_TARGET_QEMU_ARM_MODEL_SPITZ
+		|| ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER \
+		|| ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
-	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
  	default n
  	help
 	 Framebuffer support for Sharp Zaurus CL Series.
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 0eeb235c4..5584ad068 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -1,5 +1,9 @@
 menu "Input devices"
-depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCHSCREEN || ADK_TARGET_QEMU || ADK_TARGET_VBOX
+depends on ADK_TARGET_WITH_USB \
+	|| ADK_TARGET_WITH_INPUT \
+	|| ADK_TARGET_WITH_TOUCHSCREEN \
+	|| ADK_TARGET_QEMU \
+	|| ADK_TARGET_VBOX
 
 config ADK_KERNEL_INPUT
 	bool
@@ -9,8 +13,8 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	default n
 
 config ADK_KERNEL_HID_LOGITECH
@@ -32,15 +36,15 @@ config ADK_KERNEL_MOUSE_ATARI
 config ADK_KERNEL_KEYBOARD_GPIO
 	bool
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	default n
 
 config ADK_KERNEL_KEYBOARD_MATRIX
 	bool
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	default n
 
 config ADK_KERNEL_INPUT_TOUCHSCREEN
@@ -60,8 +64,8 @@ config ADK_KERNEL_INPUT_KEYBOARD
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	default n
 
 config ADK_KERNEL_INPUT_MOUSE
@@ -72,8 +76,8 @@ config ADK_KERNEL_INPUT_MOUSE
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	default n
 
 config ADK_KERNEL_INPUT_MOUSEDEV
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 6d4555e39..2e23f653d 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -87,8 +87,8 @@ config ADK_KERNEL_SERIAL_PMACZILOG
 	bool "pmac serial driver"
 	select ADK_KERNEL_SERIAL_PMACZILOG_TTYS
 	select ADK_KERNEL_SERIAL_PMACZILOG_CONSOLE
-	depends on ADK_TARGET_QEMU_M68K_Q800
-	default y if ADK_TARGET_QEMU_M68K_Q800
+	depends on ADK_TARGET_SYSTEM_QEMU_M68K_Q800
+	default y if ADK_TARGET_SYSTEM_QEMU_M68K_Q800
 	default n
 	help
 	  Serial driver for PMAC Q800 M68K.
diff --git a/target/m68k/Makefile b/target/m68k/Makefile
index 6066faf2d..0ffd9b8a2 100644
--- a/target/m68k/Makefile
+++ b/target/m68k/Makefile
@@ -8,10 +8,10 @@ include $(ADK_TOPDIR)/mk/image.mk
 KERNEL:=$(LINUX_DIR)/vmlinux
 
 QEMU_ARGS:=${ADK_QEMU_ARGS}
-ifeq ($(ADK_TARGET_QEMU_M68K_Q800),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_M68K_Q800),y)
 QEMU_ARGS+=-M q800
 endif
-ifeq ($(ADK_TARGET_QEMU_M68K_MCF5208),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208),y)
 QEMU_ARGS+=-M mcf5208evb -cpu m5208
 endif
 
diff --git a/target/m68k/systems/qemu-m68k b/target/m68k/systems/qemu-m68k
deleted file mode 100644
index 66f20b587..000000000
--- a/target/m68k/systems/qemu-m68k
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_M68K
-	bool "Qemu M68K"
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_ZIMAGE
-	help
-	 Support for Qemu Emulator M68K/Coldfire. 
-
diff --git a/target/m68k/systems/qemu-m68k-mcf5208 b/target/m68k/systems/qemu-m68k-mcf5208
new file mode 100644
index 000000000..e41a35d69
--- /dev/null
+++ b/target/m68k/systems/qemu-m68k-mcf5208
@@ -0,0 +1,10 @@
+config ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
+	bool "Qemu M68K (Coldfire MCF5208)"
+	select ADK_TARGET_QEMU
+	select ADK_CPU_CF_5208
+	select ADK_TARGET_BINFMT_FLAT
+	select ADK_TARGET_UCLINUX
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	 Support for Qemu Emulator M68K/Coldfire. 
+
diff --git a/target/m68k/systems/qemu-m68k-q800 b/target/m68k/systems/qemu-m68k-q800
new file mode 100644
index 000000000..26e5e0b2a
--- /dev/null
+++ b/target/m68k/systems/qemu-m68k-q800
@@ -0,0 +1,8 @@
+config ADK_TARGET_SYSTEM_QEMU_M68K_Q800
+	bool "Qemu M68K (Q800)"
+	select ADK_TARGET_QEMU
+	select ADK_CPU_68040
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	 Support for Qemu Emulator with M68K architecture (Q800). 
+
diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile
index 8a31dbf26..8bbaadedc 100644
--- a/target/microblaze/Makefile
+++ b/target/microblaze/Makefile
@@ -8,10 +8,10 @@ include $(ADK_TOPDIR)/mk/image.mk
 KERNEL:=$(LINUX_DIR)/arch/microblaze/boot/$(ADK_TARGET_KERNEL)
 
 QEMU_ARGS:=${ADK_QEMU_ARGS}
-ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605),y)
 QEMU_ARGS+=-M petalogix-ml605 -dtb target/microblaze/ml605.dtb
 endif
-ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800),y)
 QEMU_ARGS+=-M petalogix-s3adsp1800
 endif
 
diff --git a/target/microblaze/systems/qemu-microblaze b/target/microblaze/systems/qemu-microblaze
deleted file mode 100644
index 588979b50..000000000
--- a/target/microblaze/systems/qemu-microblaze
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
-	bool "Qemu Emulator"
-	select ADK_CPU_MICROBLAZE
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_LINUXBIN
-	help
-	  Qemu support for MICROBLAZE architecture.
-
diff --git a/target/microblaze/systems/qemu-microblaze-ml605 b/target/microblaze/systems/qemu-microblaze-ml605
new file mode 100644
index 000000000..f8dd57909
--- /dev/null
+++ b/target/microblaze/systems/qemu-microblaze-ml605
@@ -0,0 +1,8 @@
+config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
+	bool "Qemu Emulator (Xilinx ML605)"
+	select ADK_CPU_MICROBLAZE
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_LINUXBIN
+	help
+	  Qemu support for MICROBLAZE architecture (Xilinx ML605).
+
diff --git a/target/microblaze/systems/qemu-microblaze-s3adsp1800 b/target/microblaze/systems/qemu-microblaze-s3adsp1800
new file mode 100644
index 000000000..e3bcc1d8c
--- /dev/null
+++ b/target/microblaze/systems/qemu-microblaze-s3adsp1800
@@ -0,0 +1,8 @@
+config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
+	bool "Qemu Emulator (Xilinx Spartan S3ADSP1800)"
+	select ADK_CPU_MICROBLAZE
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_LINUXBIN
+	help
+	  Qemu support for MICROBLAZE architecture (Xilinx Spartan S3ADSP1800).
+
diff --git a/target/ppc/Makefile b/target/ppc/Makefile
index 7195753dc..64660ef59 100644
--- a/target/ppc/Makefile
+++ b/target/ppc/Makefile
@@ -9,14 +9,14 @@ KERNEL:=$(LINUX_DIR)/vmlinux
 OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
 
 QEMU_ARGS:=${ADK_QEMU_ARGS}
-ifeq ($(ADK_TARGET_QEMU_PPC_MACPPC),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC),y)
 QEMU_ARGS+=-M mac99
 QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0
 endif
-ifeq ($(ADK_TARGET_QEMU_PPC_VIRTEX_ML507),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507),y)
 QEMU_ARGS+=-M virtex-ml507 -m 256 -dtb $(FW_DIR)/ppc.dtb
 endif
-ifeq ($(ADK_TARGET_QEMU_PPC_BAMBOO),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO),y)
 QEMU_ARGS+=-M bamboo
 QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0
 endif
@@ -76,14 +76,14 @@ dtb-install:
 
 # filesystem specific targets
 ifeq ($(ADK_TARGET_FS),archive)
-ifeq ($(ADK_TARGET_QEMU_PPC_VIRTEX_ML507),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507),y)
 imageinstall: dtb-install $(FW_DIR)/$(ROOTFSTARBALL) targethelp
 else
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
-ifeq ($(ADK_TARGET_QEMU_PPC_VIRTEX_ML507),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507),y)
 imageinstall: dtb-install kernel-install $(FW_DIR)/$(INITRAMFS) targethelp
 else
 imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp
@@ -93,7 +93,7 @@ ifeq ($(ADK_TARGET_FS),initramfsarchive)
 imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
 endif
 ifeq ($(ADK_TARGET_FS),initramfspiggyback)
-ifeq ($(ADK_TARGET_QEMU_PPC_VIRTEX_ML507),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507),y)
 imageinstall: dtb-install createinitramfs targethelp
 else
 imageinstall: createinitramfs targethelp
diff --git a/target/ppc/systems/qemu-ppc b/target/ppc/systems/qemu-ppc
deleted file mode 100644
index d2c4086de..000000000
--- a/target/ppc/systems/qemu-ppc
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_PPC
-	bool "Qemu Emulator"
-	select ADK_TARGET_QEMU
-	help
-	 Support for Qemu Emulator PPC architecture.
-
diff --git a/target/ppc/systems/qemu-ppc-bamboo b/target/ppc/systems/qemu-ppc-bamboo
new file mode 100644
index 000000000..24d231205
--- /dev/null
+++ b/target/ppc/systems/qemu-ppc-bamboo
@@ -0,0 +1,8 @@
+config ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO
+	bool "Qemu Emulator (Bamboo)"
+	select ADK_TARGET_QEMU
+	select ADK_CPU_PPC_440
+	select ADK_TARGET_SOFT_FLOAT
+	help
+	 Support for Qemu Emulator PPC architecture (Bamboo).
+
diff --git a/target/ppc/systems/qemu-ppc-macppc b/target/ppc/systems/qemu-ppc-macppc
new file mode 100644
index 000000000..2e9ba1a4f
--- /dev/null
+++ b/target/ppc/systems/qemu-ppc-macppc
@@ -0,0 +1,8 @@
+config ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
+	bool "Qemu Emulator (MAC-PPC)"
+	select ADK_TARGET_QEMU
+	select ADK_CPU_PPC
+	select ADK_TARGET_CPU_WITH_FPU
+	help
+	 Support for Qemu Emulator PPC architecture (MAC-PPC).
+