Merge branch 'master' of git+ssh://www.openadk.org/git/openadk

Conflicts:
	TODO

8 files changed, 16 insertions, 12 deletions

diff --git a/target/arm/Makefile b/target/arm/Makefile
index e2194f1d3..77148e261 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -61,7 +61,7 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 	@echo "Use following command to install it on SD card:"
 	@echo "sudo ./scripts/install-rpi.sh /dev/sdb $(FW_DIR)/$(ROOTFSTARBALL)"
 endif
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
@@ -75,7 +75,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y)
 ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
         @echo 'qemu-system-arm -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user'
 else
@@ -88,7 +88,7 @@ ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 imageinstall: createinitramfs
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb
index ead723621..ce52647be 100644
--- a/target/arm/kernel/qemu-arm-versatilepb
+++ b/target/arm/kernel/qemu-arm-versatilepb
@@ -18,7 +18,6 @@ CONFIG_DTC=y
 CONFIG_OF=y
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
-CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_LOWLEVEL=y
diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20
index b907d39c8..f3aded1d6 100644
--- a/target/arm/sys-available/acmesystems-foxg20
+++ b/target/arm/sys-available/acmesystems-foxg20
@@ -5,10 +5,6 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	select ADK_soft_float
 	select ADK_eabi
 	select ADK_acmesystems_foxg20
-	select ADK_KERNEL_ARCH_AT91
-	select ADK_KERNEL_ARCH_AT91SAM9260
-	select ADK_KERNEL_ARCH_AT91SAM9G20
-	select ADK_KERNEL_MACH_ACMENETUSFOXG20
 	select ADK_KERNEL_AEABI
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_MMC
diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i
index 3ee6bb8cd..9a63c8350 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/sys-available/cubox-i
@@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_PACKAGE_U_BOOT_CUBOX_I
-	select ADK_USE_KERNEL_MINICONFIG
 	help
 	  Cubox-i
 
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
index 4b99f7f0e..1fa057c4b 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/target/arm/sys-available/qemu-arm
@@ -3,8 +3,9 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
 	select ADK_arm
 	select ADK_qemu_arm
 	select ADK_little
+	select ADK_soft_float
+	select ADK_eabi
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_USE_KERNEL_MINICONFIG
 	help
 	 Support for Qemu Emulator (arm).
diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf
new file mode 100644
index 000000000..85cc9c00f
--- /dev/null
+++ b/target/arm/sys-available/qemu-armhf
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_QEMU_ARMHF
+	bool "Qemu Emulator (hard-float)"
+	select ADK_arm
+	select ADK_qemu_armhf
+	select ADK_little
+	select ADK_hard_float
+	select ADK_eabihf
+	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	 Support for Qemu Emulator (armhf).
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index 3c0f2ad30..518b7b2a3 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_TARGET_WITH_INPUT
 	select ADK_PACKAGE_BCM2835_BOOTLOADER
 	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_USE_KERNEL_MINICONFIG
 	help
 	  Raspberry PI
 
diff --git a/target/arm/sys-available/sharp-zaurus b/target/arm/sys-available/sharp-zaurus
index a58401cf3..563866960 100644
--- a/target/arm/sys-available/sharp-zaurus
+++ b/target/arm/sys-available/sharp-zaurus
@@ -12,6 +12,5 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	select ADK_TARGET_WITH_SOUND
 	select ADK_TARGET_WITH_TOUCHSCREEN
 	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_USE_KERNEL_MINICONFIG
 	help
 	 Support for Sharp Zaurus CL3200 (Terrier)