Merge remote-tracking branch 'origin/master' into composite

Makefile.unix

@@ -281,31 +281,39 @@ tools/cnvwindeps$(HOSTEXEEXT):
 # setting up symbolic links with 'generic' directory names to specific,
 # configured directories.
 
-Make.defs:
-	echo "include $(TOPDIR)$(DELIM).config" > Make.defs
-	echo "include $(TOPDIR)$(DELIM)tools$(DELIM)Config.mk" >> Make.defs
+# Make.defs:
+# 	$(Q) echo "No Make.defs file found, creating one"
+# 	$(Q) echo "include $(TOPDIR)$(DELIM).config" > Make.defs
+# 	$(Q) echo "include $(TOPDIR)$(DELIM)tools$(DELIM)Config.mk" >> Make.defs
+
+# tools/initialconfig$(HOSTEXEEXT):
+# 	$(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" initialconfig$(HOSTEXEEXT)
+#
+# .config: tools/initialconfig$(HOSTEXEEXT)
+# 	$(Q) echo "No .config file found, creating one"
+# 	$(Q) tools/initialconfig$(HOSTEXEEXT)
 
 # Link the arch/<arch-name>/include directory to include/arch
 
-include/arch: Make.defs
+include/arch: .config
 	@echo "LN: include/arch to $(ARCH_DIR)/include"
 	$(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_DIR)/include include/arch
 
 # Link the configs/<board-name>/include directory to include/arch/board
 
-include/arch/board: include/arch Make.defs include/arch
+include/arch/board: include/arch
 	@echo "LN: include/arch/board to $(BOARD_DIR)/include"
 	$(Q) $(DIRLINK) $(BOARD_DIR)/include include/arch/board
 
 # Link the configs/<board-name>/src dir to arch/<arch-name>/src/board
 
-$(ARCH_SRC)/board: Make.defs
+$(ARCH_SRC)/board: .config
 	@echo "LN: $(ARCH_SRC)/board to $(BOARD_DIR)/src"
 	$(Q) $(DIRLINK) $(BOARD_DIR)/src $(ARCH_SRC)/board
 
 # Link arch/<arch-name>/include/<chip-name> to arch/<arch-name>/include/chip
 
-$(ARCH_SRC)/chip: Make.defs
+$(ARCH_SRC)/chip: .config
 ifneq ($(CONFIG_ARCH_CHIP),)
 	@echo "LN: $(ARCH_SRC)/chip to $(ARCH_SRC)/$(CONFIG_ARCH_CHIP)"
 	$(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_SRC)/$(CONFIG_ARCH_CHIP) $(ARCH_SRC)/chip
@@ -313,7 +321,7 @@ endif
 
 # Link arch/<arch-name>/src/<chip-name> to arch/<arch-name>/src/chip
 
-include/arch/chip: include/arch Make.defs
+include/arch/chip: include/arch
 ifneq ($(CONFIG_ARCH_CHIP),)
 	@echo "LN: include/arch/chip to $(ARCH_INC)/$(CONFIG_ARCH_CHIP)"
 	$(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_INC)/$(CONFIG_ARCH_CHIP) include/arch/chip

Makefile.win

@@ -276,13 +276,21 @@ tools\mkdeps$(HOSTEXEEXT):
 # setting up symbolic links with 'generic' directory names to specific,
 # configured directories.
 
-Make.defs:
-	echo "include $(TOPDIR)$(DELIM).config" > Make.defs
-	echo "include $(TOPDIR)$(DELIM)tools$(DELIM)Config.mk" >> Make.defs
+# Make.defs:
+# 	$(Q) echo "No Make.defs file found, creating one"
+# 	$(Q) echo "include $(TOPDIR)$(DELIM).config" > Make.defs
+# 	$(Q) echo "include $(TOPDIR)$(DELIM)tools$(DELIM)Config.mk" >> Make.defs
+
+# tools\initialconfig$(HOSTEXEEXT):
+# 	$(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" initialconfig$(HOSTEXEEXT)
+#
+# .config: tools\initialconfig$(HOSTEXEEXT)
+# 	$(Q) echo "No .config file found, creating one"
+# 	$(Q) tools\initialconfig$(HOSTEXEEXT)
 
 # Link the arch\<arch-name>\include directory to include\arch
 
-include\arch: Make.defs
+include\arch: .config
 	@echo LN: include\arch to $(ARCH_DIR)\include
 ifeq ($(CONFIG_WINDOWS_MKLINK),y)
 	$(Q) /user:administrator mklink /d include\arch $(TOPDIR)\$(ARCH_DIR)\include
@@ -293,7 +301,7 @@ endif
 
 # Link the configs\<board-name>\include directory to include\arch\board
 
-include\arch\board: include\arch Make.defs include\arch
+include\arch\board: include\arch
 	@echo LN: include\arch\board to $(BOARD_DIR)\include
 ifeq ($(CONFIG_WINDOWS_MKLINK),y)
 	$(Q) /user:administrator mklink /d include\arch\board $(BOARD_DIR)\include
@@ -304,7 +312,7 @@ endif
 
 # Link the configs\<board-name>\src dir to arch\<arch-name>\src\board
 
-$(ARCH_SRC)\board: Make.defs
+$(ARCH_SRC)\board: .config
 	@echo LN: $(ARCH_SRC)\board to $(BOARD_DIR)\src
 ifeq ($(CONFIG_WINDOWS_MKLINK),y)
 	$(Q) /user:administrator mklink /d $(ARCH_SRC)\board $(BOARD_DIR)\src
@@ -315,7 +323,7 @@ endif
 
 # Link arch\<arch-name>\include\<chip-name> to arch\<arch-name>\include\chip
 
-$(ARCH_SRC)\chip: Make.defs
+$(ARCH_SRC)\chip: .config
 ifneq ($(CONFIG_ARCH_CHIP),)
 	@echo LN: $(ARCH_SRC)\chip to $(ARCH_SRC)\$(CONFIG_ARCH_CHIP)
 ifeq ($(CONFIG_WINDOWS_MKLINK),y)
@@ -328,7 +336,7 @@ endif
 
 # Link arch\<arch-name>\src\<chip-name> to arch\<arch-name>\src\chip
 
-include\arch\chip: include\arch Make.defs
+include\arch\chip: include\arch
 ifneq ($(CONFIG_ARCH_CHIP),)
 	@echo LN: include\arch\chip to $(ARCH_INC)\$(CONFIG_ARCH_CHIP)
 ifeq ($(CONFIG_WINDOWS_MKLINK),y)

libxx/libxx.hxx

@@ -34,7 +34,7 @@
 //***************************************************************************
 
 #ifndef __LIBXX_LIBXX_HXX
-#define __LIBXX_LIBXX__HXX
+#define __LIBXX_LIBXX_HXX 1
 
 //***************************************************************************
 // Included Files

tools/Makefile.host

@@ -1,7 +1,7 @@
 ############################################################################
 # Makefile.host
 #
-#   Copyright (C) 2007, 2008, 2011-2012, 2015 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007, 2008, 2011-2012, 2015, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -70,7 +70,7 @@ endif
 all: b16$(HOSTEXEEXT) bdf-converter$(HOSTEXEEXT) cmpconfig$(HOSTEXEEXT) \
     configure$(HOSTEXEEXT) mkconfig$(HOSTEXEEXT) mkdeps$(HOSTEXEEXT) \
     mksymtab$(HOSTEXEEXT)  mksyscall$(HOSTEXEEXT) mkversion$(HOSTEXEEXT) \
-    cnvwindeps$(HOSTEXEEXT) nxstyle$(HOSTEXEEXT)
+    cnvwindeps$(HOSTEXEEXT) nxstyle$(HOSTEXEEXT) initialconfig$(HOSTEXEEXT)
 default: mkconfig$(HOSTEXEEXT) mksyscall$(HOSTEXEEXT) mkdeps$(HOSTEXEEXT) \
     cnvwindeps$(HOSTEXEEXT)
 
@@ -171,6 +171,17 @@ ifdef HOSTEXEEXT
 nxstyle: nxstyle$(HOSTEXEEXT)
 endif
 
+# initialconfig - Create a barebones .config file sufficient only for
+# instantiating the symbolic links necesary to do a real configuration
+# from scratch.
+
+initialconfig$(HOSTEXEEXT): initialconfig.c
+	$(Q) $(HOSTCC) $(HOSTCFLAGS) -o initialconfig$(HOSTEXEEXT) initialconfig.c
+
+ifdef HOSTEXEEXT
+initialconfig: initialconfig$(HOSTEXEEXT)
+endif
+
 # cnvwindeps - Convert dependences generated by a Windows native toolchain
 # for use in a Cygwin/POSIX build environment
 

tools/README.txt

@@ -82,6 +82,15 @@ cmdconfig.c
   This C file can be used to build a utility for comparing two NuttX
   configuration files.
 
+initialconfig.c
+---------------
+
+  This is a C file that can be used create an initial configuration.
+  This permits creating a new configuration from scratch, without
+  relying on any existing board configuration in place.  This utility
+  will create a barebones .config file sufficient only for
+  instantiating the symbolic links necesary to do a real configuration.
+
 kconfig2html.c
 --------------
 

tools/cfgparser.c

@@ -210,7 +210,7 @@ void parse_file(FILE *stream, struct variable_s **list)
 
           parse_line(ptr, &varname, &varval);
 
-          /* If the variable has not value (or the special value 'n'), then
+          /* If the variable has no value (or the special value 'n'), then
            * ignore it.
            */