From 53ef1400232706d31b0c4b386868924e1b1ae5a2 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Tue, 24 Nov 2009 22:00:40 +0100 Subject: Make architecture/variants/options selection in the same menu Signed-off-by: Abdoulaye Walsimou Gaye --- Kconfig | 5 +---- kconfig/arch-variant-mips.kconfig | 2 +- kconfig/arch.kconfig | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Kconfig b/Kconfig index c9baf27..4a97780 100644 --- a/Kconfig +++ b/Kconfig @@ -29,11 +29,8 @@ config EMBTK_DOTCONFIG bool default y -menu "Architecture Selection" +menu "Architecture/variants/options Selection" source "kconfig/arch.kconfig" -endmenu - -menu "Architecture Variant and options" source "kconfig/arch-variant.kconfig" endmenu diff --git a/kconfig/arch-variant-mips.kconfig b/kconfig/arch-variant-mips.kconfig index 78e3ee0..cf312c4 100644 --- a/kconfig/arch-variant-mips.kconfig +++ b/kconfig/arch-variant-mips.kconfig @@ -23,7 +23,7 @@ ################################################################################ choice - prompt "Architecture variant" + prompt "MIPS architecture variant" depends on EMBTK_ARCH_MIPS default EMBTK_ARCH_MIPS_MIPS32_LITTLE help diff --git a/kconfig/arch.kconfig b/kconfig/arch.kconfig index 25acab1..610b40e 100644 --- a/kconfig/arch.kconfig +++ b/kconfig/arch.kconfig @@ -34,16 +34,16 @@ choice select EMBTK_32BITS_FS config EMBTK_ARCH_MIPS bool "MIPS" - config EMBTK_ARCH_M68k - bool "M68k (unsupported yet)" - config EMBTK_ARCH_POWERPC - bool "PowerPC (unsupported yet)" - config EMBTK_ARCH_SUPERH - bool "SuperH (unsupported yet)" - config EMBTK_ARCH_X86 - bool "x86 (unsupported yet)" - config EMBTK_ARCH_X86_64 - bool "x86_64 (unsupported yet)" +# config EMBTK_ARCH_M68k +# bool "M68k (unsupported yet)" +# config EMBTK_ARCH_POWERPC +# bool "PowerPC (unsupported yet)" +# config EMBTK_ARCH_SUPERH +# bool "SuperH (unsupported yet)" +# config EMBTK_ARCH_X86 +# bool "x86 (unsupported yet)" +# config EMBTK_ARCH_X86_64 +# bool "x86_64 (unsupported yet)" endchoice config EMBTK_TARGET_ARCH_64BITS -- cgit v1.2.3