From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 16:39:17 +0200 Subject: resolve merge conflict --- target/arm/sys-available/raspberry-pi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/arm/sys-available/raspberry-pi') 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 -- cgit v1.2.3