From aa9c44f1284487a45372190e29daff73398bd027 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Thu, 18 Apr 2013 22:36:24 +0200 Subject: ARM: kconfig entries: remove un{tested, supported} cores without mmu Signed-off-by: Abdoulaye Walsimou Gaye --- kconfig/arch/arm/arm.kconfig | 74 ++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 55 deletions(-) diff --git a/kconfig/arch/arm/arm.kconfig b/kconfig/arch/arm/arm.kconfig index 0f46826..97d91bf 100644 --- a/kconfig/arch/arm/arm.kconfig +++ b/kconfig/arch/arm/arm.kconfig @@ -27,7 +27,7 @@ choice prompt "ARM Endian" depends on EMBTK_ARCH_ARM help - Select your ARM MCU endian + Select your ARM core endian config EMBTK_ARCH_ARM_LITTLE_ENDIAN bool "armel: Little endian" @@ -56,7 +56,7 @@ choice depends on EMBTK_ARCH_ARM default EMBTK_ARCH_ARM_FAMILY_ARM9TDMI help - Select ARM MCU family you want to use. + Select ARM core family you want to use. config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI bool "arm7tdmi" @@ -105,27 +105,21 @@ choice prompt "ARM arm7tdmi core in the target" depends on EMBTK_ARCH_ARM_FAMILY_ARM7TDMI help - Please choose which arm7tdmi core you want to use. + Please choose which arm7tdmi core you want to use. config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM7TDMI bool "arm7tdmi" - config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM7TDMI-S - bool "arm7tdmi-s" config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM710T bool "arm710t" config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM720T bool "arm720t" - config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM740T - bool "arm740t" -# config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM7EJ-S -# bool "arm7ej-s" endchoice choice prompt "StrongARM core in the target" depends on EMBTK_ARCH_ARM_FAMILY_STRONGARM help - Please choose which StrongARM core you want to use. + Please choose which StrongARM core you want to use. config EMBTK_ARCH_ARM_FAMILY_STRONGARM_SA bool "strongarm" @@ -141,7 +135,7 @@ choice prompt "ARM arm8 core in the target" depends on EMBTK_ARCH_ARM_FAMILY_ARM8 help - Please choose which arm8 core you want to use. + Please choose which arm8 core you want to use. config EMBTK_ARCH_ARM_FAMILY_ARM8_ARM810 bool "arm810" @@ -151,7 +145,7 @@ choice prompt "ARM arm9tdmi core in the target" depends on EMBTK_ARCH_ARM_FAMILY_ARM9TDMI help - Please choose which arm9tdmi core you want to use. + Please choose which arm9tdmi core you want to use. config EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM9TDMI bool "arm9tdmi" @@ -159,33 +153,23 @@ choice bool "arm920t" config EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM922T bool "arm922t" - config EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM940T - bool "arm940t" endchoice choice prompt "ARM arm9e core in the target" depends on EMBTK_ARCH_ARM_FAMILY_ARM9E help - Please choose which arm9e core you want to use. - - config EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM946E-S - bool "arm946e-s" - config EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM966E-S - bool "arm966e-s" - config EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM968E-S - bool "arm968e-s" + Please choose which arm9e core you want to use. + config EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM926EJ-S bool "arm926ej-s" -# config EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM996HS -# bool "arm996hs" endchoice choice prompt "ARM arm10e core in the target" depends on EMBTK_ARCH_ARM_FAMILY_ARM10E help - Please choose which arm10e core you want to use. + Please choose which arm10e core you want to use. config EMBTK_ARCH_ARM_FAMILY_ARM10E_ARM1020E bool "arm1020e" @@ -199,7 +183,7 @@ choice prompt "ARM xscale core in the target" depends on EMBTK_ARCH_ARM_FAMILY_XSCALE help - Please choose which xscale core you want to use. + Please choose which xscale core you want to use. config EMBTK_ARCH_ARM_FAMILY_XSCALE_XSCALE bool "xscale" @@ -209,7 +193,7 @@ choice prompt "ARM arm11 core in the target" depends on EMBTK_ARCH_ARM_FAMILY_ARM11 help - Please choose which arm11 core you want to use. + Please choose which arm11 core you want to use. config EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1136J-S bool "arm1136j-s" @@ -217,8 +201,6 @@ choice bool "arm1136jf-s" config EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1156T2-S bool "arm1156t2-s" -# config EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1156T2F-S -# bool "arm1156t2f-s" config EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1176JZ-S bool "arm1176jz-s" config EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1176JZF-S @@ -231,32 +213,23 @@ choice prompt "ARM cortex core in the target" depends on EMBTK_ARCH_ARM_FAMILY_CORTEX help - Please choose which cortex core you want to use. + Please choose which cortex core you want to use. + config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A5 + bool "cortex-a5" config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A8 bool "cortex-a8" config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A9 bool "cortex-a9" -# config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A9_MPCORE -# bool "cortex-a9 mpcore" - config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-R4 - bool "cortex-r4" - config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-R4F - bool "cortex-r4f" - config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-M3 - bool "cortex-m3" -# config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-M0 -# depends on EMBTK_ARCH_ARM_FAMILY_CORTEX -# bool "cortex-m0" - config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-M1 - bool "cortex-m1" + config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A15 + bool "cortex-a15" endchoice choice prompt "ARM iwmmxt core in the target" depends on EMBTK_ARCH_ARM_FAMILY_IWMMXT help - Please choose which iwmmxt core you want to use. + Please choose which iwmmxt core you want to use. config EMBTK_ARCH_ARM_FAMILY_IWMMXT_IWMMXT bool "iwmmxt" @@ -268,10 +241,8 @@ config EMBTK_ARM_MCU_STRING depends on EMBTK_ARCH_ARM string default "arm7tdmi" if EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM7TDMI - default "arm7tdmi-s" if EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM7TDMI-S default "arm710t" if EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM710T default "arm720t" if EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM720T - default "arm740t" if EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM740T default "strongarm" if EMBTK_ARCH_ARM_FAMILY_STRONGARM_SA default "strongarm110" if EMBTK_ARCH_ARM_FAMILY_STRONGARM_SA-110 default "strongarm1100" if EMBTK_ARCH_ARM_FAMILY_STRONGARM_SA-1100 @@ -280,10 +251,6 @@ config EMBTK_ARM_MCU_STRING default "arm9tdmi" if EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM9TDMI default "arm920t" if EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM920T default "arm922t" if EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM922T - default "arm940t" if EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM940T - default "arm946e-s" if EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM946E-S - default "arm966e-s" if EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM966E-S - default "arm968e-s" if EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM968E-S default "arm926ej-s" if EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM926EJ-S default "arm1020e" if EMBTK_ARCH_ARM_FAMILY_ARM10E_ARM1020E default "arm1022e" if EMBTK_ARCH_ARM_FAMILY_ARM10E_ARM1022E @@ -295,12 +262,9 @@ config EMBTK_ARM_MCU_STRING default "arm1176jz-s" if EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1176JZ-S default "arm1176jzf-s" if EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1176JZF-S default "mpcore" if EMBTK_ARCH_ARM_FAMILY_ARM11_MPCORE + default "cortex-a5" if EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A5 default "cortex-a8" if EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A8 default "cortex-a9" if EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A9 - default "cortex-r4" if EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-R4 - default "cortex-r4f" if EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-R4F - default "cortex-m3" if EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-M3 - default "cortex-m1" if EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-M1 + default "cortex-a15" if EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A15 default "iwmmxt" if EMBTK_ARCH_ARM_FAMILY_IWMMXT_IWMMXT default "iwmmxt2" if EMBTK_ARCH_ARM_FAMILY_IWMMXT_IWMMXT2 - -- cgit v1.2.3