diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.abi.choice | 15 | ||||
| -rw-r--r-- | target/config/Config.in.arm.choice | 26 | ||||
| -rw-r--r-- | target/config/Config.in.arm.default | 12 | ||||
| -rw-r--r-- | target/config/Config.in.libc.default | 2 | ||||
| -rw-r--r-- | target/config/Config.in.qemu | 33 | ||||
| -rw-r--r-- | target/config/Config.in.target | 5 |
6 files changed, 47 insertions, 46 deletions
diff --git a/target/config/Config.in.abi.choice b/target/config/Config.in.abi.choice index 3c47b517d..22d390e7b 100644 --- a/target/config/Config.in.abi.choice +++ b/target/config/Config.in.abi.choice @@ -6,15 +6,15 @@ prompt "ABI" depends on ADK_TARGET_ARCH_MIPS64 config ADK_TARGET_ABI_N32 - boolean "N32 ABI" + bool "N32 ABI" select ADK_n32 config ADK_TARGET_ABI_N64 - boolean "N64 ABI" + bool "N64 ABI" select ADK_n64 config ADK_TARGET_ABI_O32 - boolean "O32 ABI" + bool "O32 ABI" select ADK_o32 endchoice @@ -24,11 +24,11 @@ prompt "ABI" depends on ADK_TARGET_ARCH_X86_64 config ADK_TARGET_ABI_64 - boolean "64 Bit ABI" + bool "64 Bit ABI" select ADK_64 config ADK_TARGET_ABI_X32 - boolean "x32 ABI" + bool "x32 ABI" select ADK_x32 endchoice @@ -39,11 +39,12 @@ depends on ADK_TARGET_ARCH_ARM depends on ADK_TARGET_CPU_WITH_FPU || ADK_TARGET_SYSTEM_QEMU_ARM || ADK_TARGET_TOOLCHAIN config ADK_TARGET_ABI_EABIHF - boolean "EABIhf" + bool "EABIhf" select ADK_eabihf + depends on ADK_CPU_CORTEX_A9 || ADK_CPU_ARM1176JZF_S config ADK_TARGET_ABI_EABI - boolean "EABI" + bool "EABI" select ADK_eabi endchoice diff --git a/target/config/Config.in.arm.choice b/target/config/Config.in.arm.choice index 439360719..0de8794db 100644 --- a/target/config/Config.in.arm.choice +++ b/target/config/Config.in.arm.choice @@ -6,21 +6,21 @@ prompt "CPU architecture and family" depends on ADK_TARGET_TOOLCHAIN && ADK_TARGET_ARCH_ARM config ADK_CPU_ARMV7A_CORTEX_A9 - boolean "cortex-a9 (armv7-a)" + bool "cortex-a9 (armv7-a)" select ADK_CPU_CORTEX_A9 config ADK_CPU_ARMV7M_CORTEX_M3 - boolean "cortex-m3 (armv7-m)" + bool "cortex-m3 (armv7-m)" select ADK_CPU_CORTEX_M3 - select ADK_LINUX_ARM_WITH_THUMB + select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_UCLINUX config ADK_CPU_ARMV6_ARM1176JZF_S - boolean "arm1176jzf-s (armv6)" + bool "arm1176jzf-s (armv6)" select ADK_CPU_ARM1176JZF_S config ADK_CPU_ARMV5TE_ARM926EJ_S - boolean "arm926ej-s (armv5te)" + bool "arm926ej-s (armv5te)" select ADK_CPU_ARM926EJ_S endchoice @@ -30,7 +30,7 @@ prompt "Solidrun IMX6 model" depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 config ADK_TARGET_CUBOX_I4PRO - boolean "Solidrun Cubox-i4Pro" + bool "Solidrun Cubox-i4Pro" select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_WIFI select ADK_TARGET_WITH_RTC @@ -38,7 +38,7 @@ config ADK_TARGET_CUBOX_I4PRO select ADK_TARGET_WITH_SATA config ADK_TARGET_CUBOX_I2ULTRA - boolean "Solidrun Cubox-i2Ultra" + bool "Solidrun Cubox-i2Ultra" select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_WIFI select ADK_TARGET_WITH_RTC @@ -46,7 +46,7 @@ config ADK_TARGET_CUBOX_I2ULTRA select ADK_TARGET_WITH_SATA config ADK_TARGET_CUBOX_I2EX - boolean "Solidrun Cubox-i2eX" + bool "Solidrun Cubox-i2eX" select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_WIFI select ADK_TARGET_WITH_RTC @@ -54,26 +54,26 @@ config ADK_TARGET_CUBOX_I2EX select ADK_TARGET_WITH_SATA config ADK_TARGET_CUBOX_I2 - boolean "Solidrun Cubox-i2" + bool "Solidrun Cubox-i2" select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_WIFI select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_SDIO config ADK_TARGET_CUBOX_I1 - boolean "Solidrun Cubox-i1" + bool "Solidrun Cubox-i1" select ADK_TARGET_WITH_WIFI select ADK_TARGET_WITH_SDIO config ADK_TARGET_HUMMINGBOARD_I1 - boolean "Solidrun Hummingboard-i1" + bool "Solidrun Hummingboard-i1" config ADK_TARGET_HUMMINGBOARD_I2 - boolean "Solidrun Hummingboard-i2" + bool "Solidrun Hummingboard-i2" select ADK_TARGET_WITH_SMP config ADK_TARGET_HUMMINGBOARD_I2EX - boolean "Solidrun Hummingboard-i2eX" + bool "Solidrun Hummingboard-i2eX" select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_SATA diff --git a/target/config/Config.in.arm.default b/target/config/Config.in.arm.default index 3e6dac47b..53ddb76be 100644 --- a/target/config/Config.in.arm.default +++ b/target/config/Config.in.arm.default @@ -2,24 +2,24 @@ # material, please see the LICENCE file in the top-level directory. config ADK_soft_float - boolean + bool config ADK_hard_float - boolean + bool config ADK_fpu_neon - boolean + bool config ADK_fpu_vfp - boolean + bool config ADK_TARGET_ARM_HARD_FLOAT - boolean + bool select ADK_hard_float default y if ADK_TARGET_ABI_EABIHF config ADK_TARGET_ARM_SOFT_FLOAT - boolean + bool select ADK_soft_float default y if ADK_TARGET_ABI_EABI diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default index 6b4350ce6..060a8a581 100644 --- a/target/config/Config.in.libc.default +++ b/target/config/Config.in.libc.default @@ -36,6 +36,8 @@ config ADK_TARGET_WITH_NPTL default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_CRIS default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_M68K default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_M68K + default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_C6X + default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_C6X default y config ADK_TARGET_SUFFIX diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu index 4f1ec85a4..8e5d1fa1a 100644 --- a/target/config/Config.in.qemu +++ b/target/config/Config.in.qemu @@ -6,11 +6,11 @@ prompt "Qemu PPC Emulation" depends on ADK_TARGET_SYSTEM_QEMU_PPC config ADK_TARGET_QEMU_PPC_BAMBOO - boolean "Bamboo PPC" + bool "Bamboo PPC" select ADK_CPU_PPC_440 config ADK_TARGET_QEMU_PPC_MACPPC - boolean "Mac99 PPC" + bool "Mac99 PPC" select ADK_CPU_PPC select ADK_TARGET_CPU_WITH_FPU @@ -21,10 +21,10 @@ prompt "Qemu MICROBLAZE Emulation" depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 - boolean "Xilinx Spartan S3ADSP1800" + bool "Xilinx Spartan S3ADSP1800" config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 - boolean "Xilinx ML605" + bool "Xilinx ML605" endchoice @@ -33,12 +33,12 @@ prompt "Qemu XTENSA Emulation" depends on ADK_TARGET_SYSTEM_QEMU_XTENSA config ADK_TARGET_QEMU_XTENSA_DC233C - boolean "dc233c" + bool "dc233c" select ADK_KERNEL_XTENSA_VARIANT_DC233C select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX config ADK_TARGET_QEMU_XTENSA_DC232B - boolean "dc232b" + bool "dc232b" select ADK_KERNEL_XTENSA_VARIANT_DC232B endchoice @@ -53,38 +53,39 @@ prompt "Qemu ARM Emulation" depends on ADK_TARGET_SYSTEM_QEMU_ARM config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 - boolean "ARM Ltd. Versatile Express for Cortex-A9" + bool "ARM Ltd. Versatile Express for Cortex-A9" select ADK_CPU_CORTEX_A9 config ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3 - boolean "Stellaris LM3S6965EVB" + bool "Stellaris LM3S6965EVB" select ADK_soft_float select ADK_eabi select ADK_CPU_CORTEX_M3 - select ADK_LINUX_ARM_WITH_THUMB - depends on ADK_TARGET_ARM_SOFT_FLOAT + select ADK_TARGET_ARM_SOFT_FLOAT + select ADK_TARGET_ARCH_ARM_WITH_THUMB + select ADK_TARGET_UCLINUX config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB - boolean "ARM Ltd. Versatile/PB" + bool "ARM Ltd. Versatile/PB" select ADK_soft_float select ADK_eabi select ADK_CPU_ARM926EJ_S - depends on ADK_TARGET_ARM_SOFT_FLOAT + select ADK_TARGET_ARM_SOFT_FLOAT config ADK_TARGET_QEMU_ARM_MODEL_TERRIER - boolean "Xscale PXA270 Terrier PDA" + bool "Xscale PXA270 Terrier PDA" select ADK_soft_float select ADK_eabi select ADK_CPU_XSCALE select ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY - depends on ADK_TARGET_ARM_SOFT_FLOAT + select ADK_TARGET_ARM_SOFT_FLOAT config ADK_TARGET_QEMU_ARM_MODEL_SPITZ - boolean "Xscale PXA270 Spitz PDA" + bool "Xscale PXA270 Spitz PDA" select ADK_soft_float select ADK_eabi select ADK_CPU_XSCALE select ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY - depends on ADK_TARGET_ARM_SOFT_FLOAT + select ADK_TARGET_ARM_SOFT_FLOAT endchoice diff --git a/target/config/Config.in.target b/target/config/Config.in.target index fd998d611..f3bae0f8d 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -286,9 +286,6 @@ config ADK_TARGET_PACKAGE_IPKG endchoice -config ADK_TARGET_BINFMT_FLAT - boolean - choice prompt "GPU memory size" depends on ADK_TARGET_SYSTEM_RASPBERRY_PI @@ -310,7 +307,7 @@ config ADK_TARGET_GPU_MEM_128 prompt "128" boolean help - use 128 MB, required for XBMC. + use 128 MB. config ADK_TARGET_GPU_MEM_256 prompt "256" |