diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-01-16 10:13:20 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-01-16 10:13:20 -0600 |
| commit | 41bc327c19c9b05329ccd00b8b5c650e698c2a00 (patch) | |
| tree | 9be023c242dd1bb5e5a4a5f96569ca1c4219f0e2 | |
| parent | 623428fbcb4d5ab9d3fb347c88b8c1aa30df4077 (diff) | |
| download | nuttx-41bc327c19c9b05329ccd00b8b5c650e698c2a00.tar.gz nuttx-41bc327c19c9b05329ccd00b8b5c650e698c2a00.tar.bz2 nuttx-41bc327c19c9b05329ccd00b8b5c650e698c2a00.zip | |
Back out last change to configs/Kconfig. It has some bad side-effects
| -rw-r--r-- | nuttx/ChangeLog | 4 | ||||
| -rw-r--r-- | nuttx/configs/Kconfig | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index cd27bb9af..2b8e8742c 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6472,4 +6472,8 @@ specified. The default need not be used. This is really only useful when CONFIG_ARCH_BOARD_CUSTOM is selected and there is no meaningful default sub-directory (2014-1-16). + * configs/Kconfig: Backed out the previous change for two reasons: + (1) it has a bad side effect in that the sub-directory setting + no longer tracks the board setting, and (2) you still can't + source the Kconfig file from the custom board directory (2014-1-16). diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig index 7751b1fbb..17e9fdbd3 100644 --- a/nuttx/configs/Kconfig +++ b/nuttx/configs/Kconfig @@ -859,7 +859,7 @@ config ARCH_BOARD_CUSTOM endchoice config ARCH_BOARD - string "Board configuration sub-directory" + string default "amber" if ARCH_BOARD_AMBER default "arduino-due" if ARCH_BOARD_ARDUINO_DUE default "avr32dev1" if ARCH_BOARD_AVR32DEV1 @@ -947,12 +947,6 @@ config ARCH_BOARD default "zkit-arm-1769" if ARCH_BOARD_ZKITARM default "sim" if ARCH_BOARD_SIM default "" if ARCH_BOARD_CUSTOM - ---help--- - Select the board sub-directory name where the board logic resides under - the configs/ directory. Normally, the default is the correct location - and you probably not want to change that. However, if you have selected - ARCH_BOARD_CUSTOM, then you will need to tell the build system when - the board logic resides. comment "Common Board Options" |