nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Backout most of changes from 4d331ec09b2fc72636f86be628ea2f69381 and 8afe721612. Does not work as expected.

Browse source
This commit is contained in:
Gregory Nutt 2016-06-25 09:42:29 -06:00
parent 8643b59527
commit c8e73b9cef
3 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.win
View file

@ -484,7 +484,7 @@ config: context apps_preconfig
$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf Kconfig $(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf Kconfig
oldconfig: context apps_preconfig oldconfig: context apps_preconfig
$(Q) context set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig $(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig
olddefconfig: context apps_preconfig olddefconfig: context apps_preconfig
$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --olddefconfig Kconfig $(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --olddefconfig Kconfig

31
configs/Kconfig
View file

@ -1265,25 +1265,19 @@ config ARCH_BOARD_CUSTOM
endchoice endchoice
if !ARCH_BOARD_CUSTOM
config ARCH_BOARD_CUSTOM_DIR
string
default "configs/dummy"
config ARCH_BOARD_CUSTOM_DIR_RELPATH
bool
default y
endif # !ARCH_BOARD_CUSTOM
if ARCH_BOARD_CUSTOM if ARCH_BOARD_CUSTOM
menu "Custom Board Configuration" menu "Custom Board Configuration"
config ARCH_BOARD_CUSTOM_NAME
string "Custom board name"
default ""
---help---
This is a name for the board. It is not used except to return the
information via the NSH uname command.
config ARCH_BOARD_CUSTOM_DIR config ARCH_BOARD_CUSTOM_DIR
string "Custom board directory" string "Custom board directory"
default "configs/dummy" default ""
---help--- ---help---
If the custom board configuration is selected, then it is necessary If the custom board configuration is selected, then it is necessary
to also tell the build system where it can find the board directory to also tell the build system where it can find the board directory
@ -1300,12 +1294,6 @@ config ARCH_BOARD_CUSTOM_DIR_RELPATH
---help--- ---help---
Specifies that the board directory is relative to the NuttX directory. Specifies that the board directory is relative to the NuttX directory.
config ARCH_BOARD_CUSTOM_NAME
string "Custom board name"
---help---
This is a name for the board. It is not used except to return the
information via the NSH uname command.
config BOARD_CUSTOM_LEDS config BOARD_CUSTOM_LEDS
bool "Custom board LEDs" bool "Custom board LEDs"
default n default n
@ -1858,9 +1846,6 @@ endif
if ARCH_BOARD_SIM if ARCH_BOARD_SIM
source "configs/sim/Kconfig" source "configs/sim/Kconfig"
endif endif
if ARCH_BOARD_CUSTOM
source "$ARCH_BOARD_CUSTOM_DIR/Kconfig"
endif
config BOARD_CRASHDUMP config BOARD_CRASHDUMP
bool "Enable Board level logging of crash dumps" bool "Enable Board level logging of crash dumps"

4
configs/dummy/Kconfig
View file

@ -1,4 +0,0 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#