fix symbol renaming bugs

20 files changed, 48 insertions, 64 deletions

diff --git a/target/arm/Makefile b/target/arm/Makefile
index d5bbd48dd..9ac81e8f1 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -33,7 +33,7 @@ endif
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -54,7 +54,7 @@ ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -67,7 +67,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/arm/systems/keyasic-ka2000 b/target/arm/systems/keyasic-ka2000
deleted file mode 100644
index c63e73ef7..000000000
--- a/target/arm/systems/keyasic-ka2000
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_TARGET_SYSTEM_KEYASIC_KA2000
-	bool "KeyASIC KA2000 (f.e. Transcend WifiSD)"
-	select ADK_arm
-	select ADK_little
-	select ADK_soft_float
-	select ADK_eabi
-	select ADK_keyasic_ka2000
-	select ADK_CPU_ARM926EJ_S
-	select ADK_TOOLCHAIN
-	select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
-	select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
-	depends on ADK_BROKEN
-	help
-	  KeyASIC KA2000 aka Transcend WifiSD.
-	  Build a toolchain only and make all binaries static.
-
diff --git a/target/config/Config.in b/target/config/Config.in
index edabfa5e3..48f7c129c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -30,7 +30,7 @@ config ADK_TARGET_KERNEL_CUSTOMISING
 
 choice
 prompt "Toolchain options"
-depends on ADK_TOOLCHAIN
+depends on ADK_TARGET_TOOLCHAIN
 config ADK_TOOLCHAIN_ONLY
 	boolean "Only build toolchain and selected packages"
 
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index 53b61406f..433404cc6 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -60,7 +60,7 @@ config ADK_TARGET_IP
 config ADK_TARGET_PORT
 	prompt "Set target port for make check"
 	string
-	default "2222" if ADK_HARDWARE_QEMU
+	default "2222" if ADK_TARGET_QEMU
 	default "22"
 	help
 
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 30650f19a..e3f674d78 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -31,7 +31,7 @@ source "target/config/Config.in.scripts"
 
 config ADK_RUNTIME_TMPFS_SIZE
 	string "size of /tmp in memory (kB)"
-	default "16384" if ADK_HARDWARE_QEMU
+	default "16384" if ADK_TARGET_QEMU
 	default "16384" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default "32768" if ADK_TARGET_SYSTEM_IBM_X40
 	default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 4a441de8f..9bf166a36 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -88,7 +88,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA
 	boolean
 
 menu "SATA/PATA devices support"
-depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_HARDWARE_QEMU
+depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_TARGET_QEMU
 
 config ADK_KERNEL_PATA_RB532
 	prompt "CF disk driver for Mikrotik RB532"
@@ -232,7 +232,7 @@ config ADK_KERNEL_PATA_PXA
 endmenu
 
 menu "SCSI driver support"
-depends on ADK_TARGET_WITH_SCSI || ADK_HARDWARE_QEMU
+depends on ADK_TARGET_WITH_SCSI || ADK_TARGET_QEMU
 
 config ADK_KERNEL_SCSI_SYM53C8XX_2
 	prompt "Symbios Logic 53C8XX2 support"
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index c967f0aff..5e153aae1 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -142,7 +142,7 @@ config ADK_KERNEL_NE2K_PCI
 	select ADK_KERNEL_NET_VENDOR_NATSEMI
 	select ADK_KERNEL_NET_VENDOR_8390
 	select ADK_KERNEL_MII
-	depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU
+	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU
 	default y if ADK_TARGET_SYSTEM_QEMU_PPC
 	default n
 	help
@@ -164,7 +164,7 @@ 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_HARDWARE_QEMU
+	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	default n
@@ -198,7 +198,7 @@ config ADK_KERNEL_E1000
 	tristate
 	select ADK_KERNEL_NET_VENDOR_INTEL
 	select ADK_KERNEL_NETDEV_1000
-	depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU
+	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_QEMU_I486
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
@@ -215,7 +215,7 @@ config ADK_KERNEL_SUNLANCE
 	prompt "AMD Sunlance Ethernet driver"
 	tristate
 	select ADK_KERNEL_NET_VENDOR_AMD
-	depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU
+	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU
 	default y if ADK_TARGET_SYSTEM_QEMU_SPARC
 	default n
 	help
@@ -225,7 +225,7 @@ config ADK_KERNEL_IBMVETH
 	prompt "IBM Ethernet driver"
 	tristate
 	select ADK_KERNEL_NET_VENDOR_IBM
-	depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU
+	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU
 	default y if ADK_TARGET_SYSTEM_QEMU_PPC64
 	default n
 	help
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 79e558491..6107a0e85 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -1,5 +1,5 @@
 menu "Graphic devices support"
-depends on ADK_TARGET_WITH_VGA || ADK_HARDWARE_QEMU
+depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU
 
 config ADK_KERNEL_VT
 	boolean
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 5b4bbd2a3..ae315190a 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -1,5 +1,5 @@
 menu "USB support"
-depends on ADK_TARGET_WITH_USB || ADK_HARDWARE_QEMU
+depends on ADK_TARGET_WITH_USB || ADK_TARGET_QEMU
 
 config ADK_KERNEL_USB_SUPPORT
 	boolean
diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio
index f2eb577cd..06149c757 100644
--- a/target/linux/config/Config.in.virtio
+++ b/target/linux/config/Config.in.virtio
@@ -1,5 +1,5 @@
 menu "Virtio driver support"
-depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU
+depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_TARGET_QEMU
 
 config ADK_KERNEL_VIRTIO
 	boolean
diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile
index 7595cf5cf..6efcf777f 100644
--- a/target/microblaze/Makefile
+++ b/target/microblaze/Makefile
@@ -22,7 +22,7 @@ ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -35,7 +35,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
@@ -44,7 +44,7 @@ ifeq ($(ADK_TARGET_FS),squashfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following options:"
 	@echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)'
 endif
@@ -53,7 +53,7 @@ ifeq ($(ADK_TARGET_FS),jffs2)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following options:"
 	@echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)'
 endif
diff --git a/target/mips/Makefile b/target/mips/Makefile
index 5c9f7f5fc..9779330dd 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -18,7 +18,7 @@ QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -34,7 +34,7 @@ ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -47,7 +47,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/mips64/Makefile b/target/mips64/Makefile
index 39b23cf8d..42f96d27c 100644
--- a/target/mips64/Makefile
+++ b/target/mips64/Makefile
@@ -41,7 +41,7 @@ endif
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -63,7 +63,7 @@ ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -71,7 +71,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
@@ -83,7 +83,7 @@ kernel-install:
 	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
 endif
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 kernel-install:
 	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
diff --git a/target/ppc/Makefile b/target/ppc/Makefile
index b3bcfc98e..4966e322e 100644
--- a/target/ppc/Makefile
+++ b/target/ppc/Makefile
@@ -17,7 +17,7 @@ QEMU_ARGS+=${ADK_QEMU_ARGS}
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -29,7 +29,7 @@ ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -42,7 +42,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile
index d704c4973..0f0b0c03a 100644
--- a/target/ppc64/Makefile
+++ b/target/ppc64/Makefile
@@ -17,7 +17,7 @@ QEMU_ARGS+=${ADK_QEMU_ARGS}
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -29,7 +29,7 @@ ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -42,7 +42,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/sh/Makefile b/target/sh/Makefile
index a11856b21..d9fe5034a 100644
--- a/target/sh/Makefile
+++ b/target/sh/Makefile
@@ -21,7 +21,7 @@ endif
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -33,7 +33,7 @@ ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -46,7 +46,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/sparc/Makefile b/target/sparc/Makefile
index b0f86317f..0b7dd1ce9 100644
--- a/target/sparc/Makefile
+++ b/target/sparc/Makefile
@@ -16,7 +16,7 @@ QEMU_ARGS+=${ADK_QEMU_ARGS}
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -28,7 +28,7 @@ ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -41,7 +41,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile
index 9e16607fc..51b1fa89b 100644
--- a/target/sparc64/Makefile
+++ b/target/sparc64/Makefile
@@ -22,7 +22,7 @@ endif
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -34,7 +34,7 @@ ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -47,7 +47,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/x86/Makefile b/target/x86/Makefile
index 215476eb4..6b00f6aa4 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -28,7 +28,7 @@ endif
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -49,7 +49,7 @@ ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -62,7 +62,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile
index 46e5f03a6..ee581c751 100644
--- a/target/x86_64/Makefile
+++ b/target/x86_64/Makefile
@@ -28,7 +28,7 @@ endif
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -49,7 +49,7 @@ ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -62,7 +62,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif