From 9a2ce78c280ca4ee0fe988cdb2d487ac6f858f25 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 13 Nov 2012 15:50:38 +0000 Subject: [PATCH] Mostly cosmetic changes git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5344 42af7a65-404d-4744-a932-0658087f49c3 --- arch/arm/src/lm3s/Kconfig | 9 +++++++-- arch/arm/src/lpc17xx/Kconfig | 17 ++++++++++++----- arch/arm/src/lpc31xx/Kconfig | 15 ++++++++++----- arch/arm/src/stm32/Kconfig | 18 +++++++++++++----- 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/arch/arm/src/lm3s/Kconfig b/arch/arm/src/lm3s/Kconfig index 03da5c458a..ef33655f55 100644 --- a/arch/arm/src/lm3s/Kconfig +++ b/arch/arm/src/lm3s/Kconfig @@ -28,20 +28,25 @@ config ARCH_CHIP_LM3S8962 endchoice choice - prompt "Toolchain" - default LM3S_BUILDROOT + prompt "Toolchain Selection" + default LM3S_BUILDROOT if !HOST_WINDOWS + default LM3S_CODESOURCERYW if HOST_WINDOWS config LM3S_CODESOURCERYW bool "CodeSourcery GNU toolchain under Windows" + depends on HOST_WINDOWS config LM3S_CODESOURCERYL bool "CodeSourcery GNU toolchain under Linux" + depends on HOST_LINUX config LM3S_DEVKITARM bool "devkitARM GNU toolchain" + depends on HOST_WINDOWS config LM3S_BUILDROOT bool "Buildroot" + depends on !WINDOWS_NATIVE endchoice diff --git a/arch/arm/src/lpc17xx/Kconfig b/arch/arm/src/lpc17xx/Kconfig index 2769fc231f..8a12ad9023 100644 --- a/arch/arm/src/lpc17xx/Kconfig +++ b/arch/arm/src/lpc17xx/Kconfig @@ -58,26 +58,33 @@ config ARCH_FAMILY_LPC176X choice prompt "Toolchain Selection" - default LPC17_CODESOURCERYW + default LPC17_BUILDROOT if !HOST_WINDOWS + default LPC17_CODESOURCERYW if HOST_WINDOWS depends on ARCH_CHIP_LPC17XX config LPC17_CODESOURCERYW - bool "CodeSourcery for Windows" + bool "CodeSourcery GNU toolchain under Windows" + depends on HOST_WINDOWS config LPC17_CODESOURCERYL - bool "CodeSourcery for Linux" + bool "CodeSourcery GNU toolchain under Linux" + depends on HOST_LINUX config LPC17_DEVKITARM - bool "DevkitARM (Windows)" + bool "devkitARM GNU toolchain" + depends on HOST_WINDOWS config LPC17_BUILDROOT - bool "NuttX buildroot (Cygwin or Linux)" + bool "Buildroot" + depends on !WINDOWS_NATIVE config LPC17_CODEREDW bool "CodeRed for Windows" + depends on HOST_WINDOWS config LPC17_CODEREDL bool "CodeRed for Windows" + depends on HOST_LINUX endchoice diff --git a/arch/arm/src/lpc31xx/Kconfig b/arch/arm/src/lpc31xx/Kconfig index 39b19b95d5..ad7bf3d4ed 100644 --- a/arch/arm/src/lpc31xx/Kconfig +++ b/arch/arm/src/lpc31xx/Kconfig @@ -26,20 +26,25 @@ endchoice choice prompt "Toolchain Selection" - default LPC31_CODESOURCERYW + default LPC31_BUILDROOT if !HOST_WINDOWS + default LPC31_CODESOURCERYW if HOST_WINDOWS depends on ARCH_CHIP_LPC31XX config LPC31_CODESOURCERYW - bool "CodeSourcery for Windows" + bool "CodeSourcery GNU toolchain under Windows" + depends on HOST_WINDOWS config LPC31_CODESOURCERYL - bool "CodeSourcery for Linux" + bool "CodeSourcery GNU toolchain under Linux" + depends on HOST_LINUX config LPC31_DEVKITARM - bool "DevkitARM (Windows)" + bool "devkitARM GNU toolchain" + depends on HOST_WINDOWS config LPC31_BUILDROOT - bool "NuttX buildroot (Cygwin or Linux)" + bool "Buildroot" + depends on !WINDOWS_NATIVE endchoice diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig index a0e3fab0c6..81ba9e4a37 100644 --- a/arch/arm/src/stm32/Kconfig +++ b/arch/arm/src/stm32/Kconfig @@ -195,29 +195,37 @@ config STM32_STM32F40XX choice prompt "Toolchain Selection" - default STM32_CODESOURCERYW + default LPC31_BUILDROOT if !HOST_WINDOWS + default STM32_CODESOURCERYW if HOST_WINDOWS depends on ARCH_CHIP_STM32 config STM32_CODESOURCERYW - bool "CodeSourcery for Windows" + bool "CodeSourcery GNU toolchain under Windows" + depends on HOST_WINDOWS config STM32_CODESOURCERYL - bool "CodeSourcery for Linux" + bool "CodeSourcery GNU toolchain under Linux" + depends on HOST_LINUX config STM32_ATOLLIC_LITE bool "Atollic Lite for Windows" + depends on HOST_WINDOWS config STM32_ATOLLIC_PRO bool "Atollic Pro for Windows" + depends on HOST_WINDOWS config STM32_DEVKITARM - bool "DevkitARM (Windows)" + bool "devkitARM GNU toolchain" + depends on HOST_WINDOWS config STM32_RAISONANCE bool "STMicro Raisonance for Windows" + depends on HOST_WINDOWS config STM32_BUILDROOT - bool "NuttX buildroot (Cygwin or Linux)" + bool "Buildroot (Cygwin or Linux)" + depends on !WINDOWS_NATIVE endchoice