sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Back out last change to configs/Kconfig. It has some bad side-effects

Browse Source
This commit is contained in:
Gregory Nutt 2014-01-16 10:13:20 -06:00
parent 0309c63a23
commit ebc3a64e35
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -6472,4 +6472,8 @@
specified. The default need not be used. This is really only specified. The default need not be used. This is really only
useful when CONFIG_ARCH_BOARD_CUSTOM is selected and there is no useful when CONFIG_ARCH_BOARD_CUSTOM is selected and there is no
meaningful default sub-directory (2014-1-16). 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).

8
configs/Kconfig
View File

@ -859,7 +859,7 @@ config ARCH_BOARD_CUSTOM
endchoice endchoice
config ARCH_BOARD config ARCH_BOARD
string "Board configuration sub-directory" string
default "amber" if ARCH_BOARD_AMBER default "amber" if ARCH_BOARD_AMBER
default "arduino-due" if ARCH_BOARD_ARDUINO_DUE default "arduino-due" if ARCH_BOARD_ARDUINO_DUE
default "avr32dev1" if ARCH_BOARD_AVR32DEV1 default "avr32dev1" if ARCH_BOARD_AVR32DEV1
@ -947,12 +947,6 @@ config ARCH_BOARD
default "zkit-arm-1769" if ARCH_BOARD_ZKITARM default "zkit-arm-1769" if ARCH_BOARD_ZKITARM
default "sim" if ARCH_BOARD_SIM default "sim" if ARCH_BOARD_SIM
default "" if ARCH_BOARD_CUSTOM 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" comment "Common Board Options"