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

4 files changed, 8 insertions, 40 deletions

diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
index eec8410ff..1fa057c4b 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/target/arm/sys-available/qemu-arm
@@ -3,6 +3,8 @@ 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
 	help
diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf
index 07059a8f3..798391b8c 100644
--- a/target/arm/sys-available/qemu-armhf
+++ b/target/arm/sys-available/qemu-armhf
@@ -3,6 +3,8 @@ config ADK_TARGET_SYSTEM_QEMU_ARMHF
 	select ADK_arm
 	select ADK_qemu_arm
 	select ADK_little
+	select ADK_hard_float
+	select ADK_eabihf
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
diff --git a/target/config/Config.in b/target/config/Config.in
index a8b69fb90..a917f6a3c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -279,25 +279,11 @@ config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
 endchoice
 
 choice
-prompt "Qemu ARM Emulation (hard-float)"
-depends on ADK_TARGET_SYSTEM_QEMU_ARMHF
-
-config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
-	boolean "ARM Ltd. Versatile Express for Cortex-A9"
-	select ADK_hard_float
-	select ADK_eabihf
-	select ADK_CPU_CORTEX_A9
-
-endchoice
-
-choice
 prompt "Qemu ARM Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_ARM
+depends on ADK_TARGET_SYSTEM_QEMU_ARM || ADK_TARGET_SYSTEM_QEMU_ARMHF
 
 config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
 	boolean "ARM Ltd. Versatile Express for Cortex-A9"
-	select ADK_soft_float
-	select ADK_eabi
 	select ADK_CPU_CORTEX_A9
 
 config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
@@ -305,6 +291,7 @@ config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
 	select ADK_soft_float
 	select ADK_eabi
 	select ADK_CPU_ARM926EJ_S
+	depends on ADK_TARGET_SYSTEM_QEMU_ARM
 
 config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	boolean "Xscale PXA270 Spitz PDA"
@@ -312,6 +299,7 @@ config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	select ADK_eabi
 	select ADK_CPU_XSCALE
 	select ADK_TARGET_WITH_VGA
+	depends on ADK_TARGET_SYSTEM_QEMU_ARM
 
 endchoice
 
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index d282ca91e..d3a15d602 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -22,15 +22,6 @@ config ADK_KERNEL_SND_PCM
 config ADK_KERNEL_SND_HWDEP
 	boolean
 
-config ADK_KERNEL_SND_OSSEMUL
-	boolean
-
-config ADK_KERNEL_SND_MIXER_OSS
-	boolean
-
-config ADK_KERNEL_SND_PCM_OSS
-	boolean
-
 config ADK_KPACKAGE_KMOD_SOUND
 	tristate
 
@@ -47,27 +38,12 @@ config ADK_KPACKAGE_KMOD_SND_COMPRESS
 	tristate
 
 config ADK_KPACKAGE_KMOD_SND
-	prompt "kmod-snd...................... ALSA sound support"
 	tristate
 	select ADK_KPACKAGE_KMOD_SOUND
-	select ADK_KERNEL_SND_OSSEMUL
 	select ADK_KERNEL_SND_TIMER
 	select ADK_KERNEL_SND_PCM
 	select ADK_KERNEL_SND_HWDEP
 	default n
-	help
-	 Basic ALSA sound support.
-
-config ADK_KPACKAGE_KMOD_SND_OSSEMUL
-	prompt "kmod-snd-ossemul.............. ALSA OSS Emulation"
-	tristate
-	select ADK_KERNEL_SND_MIXER_OSS
-	select ADK_KERNEL_SND_PCM_OSS
-	select ADK_KPACKAGE_KMOD_SND
-	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default n
-	help
-	 ALSA OSS Emulation
 
 config ADK_KPACKAGE_KMOD_SND_INTEL8X0
 	prompt "kmod-snd-intel8x0............. Intel AC97 driver"
@@ -142,7 +118,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835
 	default n
 
 config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
-	prompt "kmod-snd-bcm2708-soc-i2s........ ALSA SOC I2S Raspberry PI"
+	prompt "kmod-snd-bcm2708-soc-i2s...... ALSA SOC I2S Raspberry PI"
 	select ADK_KPACKAGE_KMOD_SND
 	select ADK_KERNEL_SND_ARM
 	select ADK_KPACKAGE_KMOD_SND_SOC