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/cubox-i | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/arm/sys-available/cubox-i')
| -rw-r--r-- | target/arm/sys-available/cubox-i | 4 |
1 files changed, 2 insertions, 2 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 |