resolve merge conflict

6 files changed, 8 insertions, 37 deletions

diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i
index 2dce4fb31..d3edb99c6 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/sys-available/cubox-i
@@ -2,11 +2,11 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	bool "Cubox-i"
 	select ADK_arm
 	select ADK_little
-	select ADK_hard_float
 	select ADK_eabihf
 	select ADK_fpu_neon
 	select ADK_cubox_i
 	select ADK_CPU_CORTEX_A9
+	select ADK_TARGET_CPU_WITH_FPU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_CPU_FREQ
 	select ADK_TARGET_WITH_USB
@@ -22,5 +22,5 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_PACKAGE_U_BOOT_IMX6
 	help
-	  Cubox-i
+	  Solidrun Cubox-i
 
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
index 1fa057c4b..848179629 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/target/arm/sys-available/qemu-arm
@@ -3,9 +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_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
-	 Support for Qemu Emulator (arm).
+	  Qemu Emulator for arm architecture.
diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf
deleted file mode 100644
index dab039931..000000000
--- a/target/arm/sys-available/qemu-armhf
+++ /dev/null
@@ -1,12 +0,0 @@
-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_fpu_vfp
-	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 6326a1e57..45fd531d3 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -2,11 +2,11 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	bool "Raspberry PI"
 	select ADK_arm
 	select ADK_little
-	select ADK_hard_float
 	select ADK_eabihf
 	select ADK_fpu_vfp
 	select ADK_raspberry_pi
 	select ADK_CPU_ARM1176JZF_S
+	select ADK_TARGET_CPU_WITH_FPU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_CPU_FREQ
 	select ADK_TARGET_WITH_USB
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
index 876bcd84a..a98f9c225 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/sys-available/toolchain-arm
@@ -1,12 +1,10 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
-	bool "Toolchain only (soft float)"
+	bool "Toolchain only"
 	select ADK_arm
 	select ADK_toolchain_arm
 	select ADK_little
-	select ADK_soft_float
 	select ADK_eabi
-	select ADK_TOOLCHAIN
+	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
-	select ADK_CPU_CORTEX_A9
 	help
-	  ARM toolchain (soft float) for Cortex A9.
+	  ARM toolchain.
diff --git a/target/arm/sys-available/toolchain-armhf b/target/arm/sys-available/toolchain-armhf
deleted file mode 100644
index 252a41aa2..000000000
--- a/target/arm/sys-available/toolchain-armhf
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMHF
-	bool "Toolchain only (hard float)"
-	select ADK_arm
-	select ADK_little
-	select ADK_hard_float
-	select ADK_eabihf
-	select ADK_fpu_vfp
-	select ADK_toolchain_armhf
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	select ADK_CPU_CORTEX_A9
-	help
-	  ARM toolchain (hard float) for Cortex A9.
-