diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /target/arm/sys-available/raspberry-pi | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/arm/sys-available/raspberry-pi')
| -rw-r--r-- | target/arm/sys-available/raspberry-pi | 2 |
1 files changed, 1 insertions, 1 deletions
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 |