Autogenerate directory Kconfig

1. Autogenerate target : Kconfig in apps, apps/examples, apps/netutils, apps/system
2. Add empty preconfig rules at leaf Makefiles
3. Move entry Kconfig
4. Autogenerate Kconfig_ENTRY

diff --git a/apps/.gitignore b/apps/.gitignore
index 1de4a40..9f2ace0 100644 (file)
--- a/apps/.gitignore
+++ b/apps/.gitignore
@@ -1,4 +1,4 @@
-/Kconfig
+/Kconfig*
 /bin
 /external
 /.context

diff --git a/apps/Directory.mk b/apps/Directory.mk
index 62eda15..3884d3d 100644 (file)
--- a/apps/Directory.mk
+++ b/apps/Directory.mk
@@ -52,6 +52,7 @@
 
 -include $(TOPDIR)/.config # Current configuration
 include $(APPDIR)/Make.defs
+include $(APPDIR)/import/Make.defs
 
 # Sub-directories
 
@@ -66,6 +67,7 @@ $(1)_$(2):
        $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
 endef
 
+$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),preconfig)))
 $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),context)))
 $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
 $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
@@ -75,6 +77,10 @@ nothing:
 
 install:
 
+preconfig: $(foreach SDIR, $(SUBDIRS), $(SDIR)_preconfig)
+       $(Q) $(MKKCONFIG) -m $(MENUDESC)
+       $(Q) $(MKKCONFIG) -o Kconfig_ENTRY
+
 context: $(foreach SDIR, $(SUBDIRS), $(SDIR)_context)
 
 depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)
@@ -82,5 +88,6 @@ depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)
 clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean)
 
 distclean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)
+       $(call DELFILE, Kconfig*)
 
 -include Make.dep

diff --git a/apps/Makefile b/apps/Makefile
index 11d91bb..80be07f 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -93,11 +93,17 @@ BIN = libapps$(LIBEXT)
 # Build targets
 
 all: $(BIN)
-.PHONY: import install context context_serialize context_rest .depdirs depend clean distclean
+.PHONY: import install context context_serialize context_rest .depdirs preconfig depend clean distclean
+
+define MAKE_template
+       $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)"
+
+endef
 
 define SDIR_template
 $(1)_$(2):
        $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)"
+
 endef
 
 $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),all)))
@@ -129,11 +135,10 @@ context_serialize:
 
 context: context_serialize
 
-Kconfig:
+preconfig:
        $(foreach SDIR, $(BUILDIRS), $(call MAKE_template,$(SDIR),preconfig))
        $(Q) $(MKKCONFIG)
-
-preconfig: Kconfig
+       $(Q) $(MKKCONFIG) -o Kconfig_ENTRY
 
 .depdirs: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_depend)
 
@@ -144,7 +149,6 @@ depend: .depend
 
 clean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_clean)
        $(call DELFILE, $(BIN))
-       $(call DELFILE, Kconfig)
        $(call DELDIR, $(BIN_DIR))
        $(call CLEAN)
 
@@ -165,6 +169,6 @@ else
 endif
        $(call DELFILE, .depend)
        $(call DELFILE, $(BIN))
-       $(call DELFILE, Kconfig)
+       $(call DELFILE, Kconfig*)
        $(call DELDIR, $(BIN_DIR))
        $(call CLEAN)

diff --git a/apps/apps_entry/Kconfig b/apps/apps_entry/Kconfig
new file mode 100644 (file)
index 0000000..efab4a1
--- /dev/null
+++ b/apps/apps_entry/Kconfig
@@ -0,0 +1,24 @@
+#
+# For a description of the syntax of this configuration file,
+# see kconfig-language at https://www.kernel.org/doc/Documentation/kbuild/kconfig-language.txt
+#
+
+if INIT_ENTRYPOINT
+choice
+       prompt "Application entry point"
+config ENTRY_MANUAL
+       bool "Set entry point manually"
+       ---help---
+               If you select this, you should add a function name as an application entry point
+               at "Entry point function name".
+
+comment "Application entry point list"
+source "$APPSDIR/Kconfig_ENTRY"
+endchoice
+
+config USER_ENTRYPOINT
+       string "Entry point function name" if ENTRY_MANUAL
+       ---help---
+               The name of the entry point for user applications.
+endif # INIT_ENTRYPOINT
+

diff --git a/apps/examples/.gitignore b/apps/examples/.gitignore
new file mode 100644 (file)
index 0000000..adc504e
--- /dev/null
+++ b/apps/examples/.gitignore
@@ -0,0 +1,2 @@
+/Kconfig*
+

diff --git a/apps/examples/Kconfig b/apps/examples/Kconfig
deleted file mode 100644 (file)
index dde9c47..0000000
--- a/apps/examples/Kconfig
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see kconfig-language at https://www.kernel.org/doc/Documentation/kbuild/kconfig-language.txt
-#
-
-menu "Examples"
-if INIT_ENTRYPOINT
-choice
-       prompt "Application entry point"
-
-config ENTRY_MANUAL
-       bool "manual entry"
-
-source "$APPSDIR/examples/artik_demo/Kconfig_ENTRY"
-source "$APPSDIR/examples/dnsclient_test/Kconfig_ENTRY"
-source "$APPSDIR/examples/dtls_client/Kconfig_ENTRY"
-source "$APPSDIR/examples/dtls_server/Kconfig_ENTRY"
-source "$APPSDIR/examples/fota_sample/Kconfig_ENTRY"
-source "$APPSDIR/examples/hello/Kconfig_ENTRY"
-source "$APPSDIR/examples/hello_tash/Kconfig_ENTRY"
-source "$APPSDIR/examples/helloxx/Kconfig_ENTRY"
-source "$APPSDIR/examples/iperf/Kconfig_ENTRY"
-source "$APPSDIR/examples/kernel_sample/Kconfig_ENTRY"
-source "$APPSDIR/examples/mdns_test/Kconfig_ENTRY"
-source "$APPSDIR/examples/mpu/Kconfig_ENTRY"
-source "$APPSDIR/examples/nettest/Kconfig_ENTRY"
-source "$APPSDIR/examples/ntpclient_test/Kconfig_ENTRY"
-source "$APPSDIR/examples/proc_test/Kconfig_ENTRY"
-source "$APPSDIR/examples/select_test/Kconfig_ENTRY"
-source "$APPSDIR/examples/sysio_test/Kconfig_ENTRY"
-source "$APPSDIR/examples/telnetd/Kconfig_ENTRY"
-source "$APPSDIR/examples/testcase/Kconfig_ENTRY"
-source "$APPSDIR/examples/tls_client/Kconfig_ENTRY"
-source "$APPSDIR/examples/tls_selftest/Kconfig_ENTRY"
-source "$APPSDIR/examples/tls_server/Kconfig_ENTRY"
-source "$APPSDIR/examples/wakaama_client/Kconfig_ENTRY"
-source "$APPSDIR/examples/webclient/Kconfig_ENTRY"
-source "$APPSDIR/examples/webserver/Kconfig_ENTRY"
-source "$APPSDIR/examples/websocket/Kconfig_ENTRY"
-source "$APPSDIR/examples/workqueue/Kconfig_ENTRY"
-
-endchoice
-
-config USER_ENTRYPOINT
-       string "Application entry point" if ENTRY_MANUAL
-       ---help---
-               The name of the entry point for user applications.
-
-endif # INIT_ENTRYPOINT
-
-source "$APPSDIR/examples/dnsclient_test/Kconfig"
-source "$APPSDIR/examples/dtls_client/Kconfig"
-source "$APPSDIR/examples/dtls_server/Kconfig"
-source "$APPSDIR/examples/fota_sample/Kconfig"
-source "$APPSDIR/examples/hello/Kconfig"
-source "$APPSDIR/examples/hello_tash/Kconfig"
-source "$APPSDIR/examples/helloxx/Kconfig"
-source "$APPSDIR/examples/iperf/Kconfig"
-source "$APPSDIR/examples/kernel_sample/Kconfig"
-source "$APPSDIR/examples/mdns_test/Kconfig"
-source "$APPSDIR/examples/mpu/Kconfig"
-source "$APPSDIR/examples/nettest/Kconfig"
-source "$APPSDIR/examples/ntpclient_test/Kconfig"
-source "$APPSDIR/examples/slsiwifi/Kconfig"
-source "$APPSDIR/examples/proc_test/Kconfig"
-source "$APPSDIR/examples/select_test/Kconfig"
-source "$APPSDIR/examples/sysio_test/Kconfig"
-source "$APPSDIR/examples/telnetd/Kconfig"
-source "$APPSDIR/examples/testcase/Kconfig"
-source "$APPSDIR/examples/tls_client/Kconfig"
-source "$APPSDIR/examples/tls_selftest/Kconfig"
-source "$APPSDIR/examples/tls_server/Kconfig"
-source "$APPSDIR/examples/wakaama_client/Kconfig"
-source "$APPSDIR/examples/webclient/Kconfig"
-source "$APPSDIR/examples/webserver/Kconfig"
-source "$APPSDIR/examples/websocket/Kconfig"
-source "$APPSDIR/examples/workqueue/Kconfig"
-source "$APPSDIR/examples/artik_demo/Kconfig"
-source "$APPSDIR/examples/slsiwifi/Kconfig"
-source "$APPSDIR/examples/mqtt_test/Kconfig"
-source "$APPSDIR/examples/eeprom_test/Kconfig"
-source "$APPSDIR/examples/sensorbd_demo/Kconfig"
-endmenu

diff --git a/apps/examples/Makefile b/apps/examples/Makefile
index 2412200..9fa7456 100644 (file)
--- a/apps/examples/Makefile
+++ b/apps/examples/Makefile
@@ -50,4 +50,6 @@
 #
 ############################################################################
 
+MENUDESC = "Examples"
+
 include $(APPDIR)/Directory.mk

diff --git a/apps/examples/artik_demo/Makefile b/apps/examples/artik_demo/Makefile
index 10274c0..251ed11 100644 (file)
--- a/apps/examples/artik_demo/Makefile
+++ b/apps/examples/artik_demo/Makefile
@@ -143,3 +143,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/dnsclient_test/Makefile b/apps/examples/dnsclient_test/Makefile
index 53c25cd..7785d76 100755 (executable)
--- a/apps/examples/dnsclient_test/Makefile
+++ b/apps/examples/dnsclient_test/Makefile
@@ -145,3 +145,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/dtls_client/Makefile b/apps/examples/dtls_client/Makefile
index 8cae558..1581e07 100644 (file)
--- a/apps/examples/dtls_client/Makefile
+++ b/apps/examples/dtls_client/Makefile
@@ -144,3 +144,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/dtls_server/Makefile b/apps/examples/dtls_server/Makefile
index a7c06b2..a3c5621 100644 (file)
--- a/apps/examples/dtls_server/Makefile
+++ b/apps/examples/dtls_server/Makefile
@@ -144,3 +144,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/eeprom_test/Makefile b/apps/examples/eeprom_test/Makefile
index a580e9e..e05d4f1 100644 (file)
--- a/apps/examples/eeprom_test/Makefile
+++ b/apps/examples/eeprom_test/Makefile
@@ -139,3 +139,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/fota_sample/Makefile b/apps/examples/fota_sample/Makefile
index a6f3f43..20757e6 100644 (file)
--- a/apps/examples/fota_sample/Makefile
+++ b/apps/examples/fota_sample/Makefile
@@ -146,3 +146,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/hello/Makefile b/apps/examples/hello/Makefile
index caa1129..2333593 100644 (file)
--- a/apps/examples/hello/Makefile
+++ b/apps/examples/hello/Makefile
@@ -145,3 +145,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/hello_tash/Makefile b/apps/examples/hello_tash/Makefile
index 84dc83a..6afa4ff 100644 (file)
--- a/apps/examples/hello_tash/Makefile
+++ b/apps/examples/hello_tash/Makefile
@@ -139,3 +139,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/helloxx/Makefile b/apps/examples/helloxx/Makefile
index 47de993..31580de 100644 (file)
--- a/apps/examples/helloxx/Makefile
+++ b/apps/examples/helloxx/Makefile
@@ -150,3 +150,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/iperf/Makefile b/apps/examples/iperf/Makefile
index a5454d5..81b5a96 100644 (file)
--- a/apps/examples/iperf/Makefile
+++ b/apps/examples/iperf/Makefile
@@ -113,3 +113,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/kernel_sample/Makefile b/apps/examples/kernel_sample/Makefile
index 3a6cbea..43fffb8 100644 (file)
--- a/apps/examples/kernel_sample/Makefile
+++ b/apps/examples/kernel_sample/Makefile
@@ -197,3 +197,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/mdns_test/Makefile b/apps/examples/mdns_test/Makefile
index 9365c47..42252dc 100644 (file)
--- a/apps/examples/mdns_test/Makefile
+++ b/apps/examples/mdns_test/Makefile
@@ -145,3 +145,6 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:
+

diff --git a/apps/examples/mpu/Makefile b/apps/examples/mpu/Makefile
index 6524bc7..6b8f915 100644 (file)
--- a/apps/examples/mpu/Makefile
+++ b/apps/examples/mpu/Makefile
@@ -145,3 +145,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/mqtt_test/Makefile b/apps/examples/mqtt_test/Makefile
index 6489245..d35bb3e 100644 (file)
--- a/apps/examples/mqtt_test/Makefile
+++ b/apps/examples/mqtt_test/Makefile
@@ -141,3 +141,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/nettest/Makefile b/apps/examples/nettest/Makefile
index 414371f..9f6b973 100644 (file)
--- a/apps/examples/nettest/Makefile
+++ b/apps/examples/nettest/Makefile
@@ -143,3 +143,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/ntpclient_test/Makefile b/apps/examples/ntpclient_test/Makefile
index a2b5bf7..cc0d4a4 100644 (file)
--- a/apps/examples/ntpclient_test/Makefile
+++ b/apps/examples/ntpclient_test/Makefile
@@ -145,3 +145,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/proc_test/Makefile b/apps/examples/proc_test/Makefile
index accf016..4cf8577 100644 (file)
--- a/apps/examples/proc_test/Makefile
+++ b/apps/examples/proc_test/Makefile
@@ -139,3 +139,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/select_test/Makefile b/apps/examples/select_test/Makefile
index 21d0e65..4621e43 100644 (file)
--- a/apps/examples/select_test/Makefile
+++ b/apps/examples/select_test/Makefile
@@ -145,3 +145,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/sensorbd_demo/Makefile b/apps/examples/sensorbd_demo/Makefile
index 8b695ac..fd2a4f1 100644 (file)
--- a/apps/examples/sensorbd_demo/Makefile
+++ b/apps/examples/sensorbd_demo/Makefile
@@ -146,3 +146,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/slsiwifi/Makefile b/apps/examples/slsiwifi/Makefile
index cb391ab..ce1b390 100755 (executable)
--- a/apps/examples/slsiwifi/Makefile
+++ b/apps/examples/slsiwifi/Makefile
@@ -156,4 +156,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
-
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/sysio_test/Makefile b/apps/examples/sysio_test/Makefile
index 31054c6..ccadc5d 100644 (file)
--- a/apps/examples/sysio_test/Makefile
+++ b/apps/examples/sysio_test/Makefile
@@ -147,3 +147,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/telnetd/Makefile b/apps/examples/telnetd/Makefile
index 16bf452..9ff76d6 100644 (file)
--- a/apps/examples/telnetd/Makefile
+++ b/apps/examples/telnetd/Makefile
@@ -147,3 +147,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/testcase/Makefile b/apps/examples/testcase/Makefile
index 18c1190..fec180c 100644 (file)
--- a/apps/examples/testcase/Makefile
+++ b/apps/examples/testcase/Makefile
@@ -138,4 +138,5 @@ distclean: clean
 
 
 -include Make.dep
-
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/tls_client/Makefile b/apps/examples/tls_client/Makefile
index e5fca87..828e716 100644 (file)
--- a/apps/examples/tls_client/Makefile
+++ b/apps/examples/tls_client/Makefile
@@ -144,3 +144,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/tls_selftest/Makefile b/apps/examples/tls_selftest/Makefile
index beaa0b0..440bb61 100644 (file)
--- a/apps/examples/tls_selftest/Makefile
+++ b/apps/examples/tls_selftest/Makefile
@@ -145,3 +145,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/tls_server/Makefile b/apps/examples/tls_server/Makefile
index ebf485c..e5d687b 100644 (file)
--- a/apps/examples/tls_server/Makefile
+++ b/apps/examples/tls_server/Makefile
@@ -144,3 +144,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/wakaama_client/Makefile b/apps/examples/wakaama_client/Makefile
index fef389d..2983bd8 100644 (file)
--- a/apps/examples/wakaama_client/Makefile
+++ b/apps/examples/wakaama_client/Makefile
@@ -156,3 +156,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/webclient/Makefile b/apps/examples/webclient/Makefile
index 39f1529..006fef0 100644 (file)
--- a/apps/examples/webclient/Makefile
+++ b/apps/examples/webclient/Makefile
@@ -143,3 +143,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/webserver/Makefile b/apps/examples/webserver/Makefile
index ad8fb70..1174112 100644 (file)
--- a/apps/examples/webserver/Makefile
+++ b/apps/examples/webserver/Makefile
@@ -143,4 +143,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
-
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/websocket/Makefile b/apps/examples/websocket/Makefile
index 14b2d55..e773e10 100644 (file)
--- a/apps/examples/websocket/Makefile
+++ b/apps/examples/websocket/Makefile
@@ -149,3 +149,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/examples/workqueue/Makefile b/apps/examples/workqueue/Makefile
index fb66501..8cf2d03 100644 (file)
--- a/apps/examples/workqueue/Makefile
+++ b/apps/examples/workqueue/Makefile
@@ -143,3 +143,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/import/Make.defs b/apps/import/Make.defs
index 1ee3491..b63364d 100644 (file)
--- a/apps/import/Make.defs
+++ b/apps/import/Make.defs
@@ -50,8 +50,8 @@
 #
 ############################################################################
 
-include $(TOPDIR)/.config
-include $(TOPDIR)/build/Make.defs
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/build/Make.defs
 
 # Control build verbosity
 #

diff --git a/apps/netutils/.gitignore b/apps/netutils/.gitignore
index 123ef23..489c3d5 100644 (file)
--- a/apps/netutils/.gitignore
+++ b/apps/netutils/.gitignore
@@ -13,3 +13,4 @@
 *.adb
 *.lib
 *.src
+/Kconfig*

diff --git a/apps/netutils/Kconfig b/apps/netutils/Kconfig
deleted file mode 100644 (file)
index f254a97..0000000
--- a/apps/netutils/Kconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see kconfig-language at https://www.kernel.org/doc/Documentation/kbuild/kconfig-language.txt
-#
-
-menu "Network Utilities"
-source "$APPSDIR/netutils/codecs/Kconfig"
-source "$APPSDIR/netutils/dhcpc/Kconfig"
-source "$APPSDIR/netutils/dhcpd/Kconfig"
-source "$APPSDIR/netutils/ftpc/Kconfig"
-source "$APPSDIR/netutils/ftpd/Kconfig"
-source "$APPSDIR/netutils/json/Kconfig"
-source "$APPSDIR/netutils/smtp/Kconfig"
-source "$APPSDIR/netutils/telnetd/Kconfig"
-source "$APPSDIR/netutils/tftpc/Kconfig"
-source "$APPSDIR/netutils/netlib/Kconfig"
-source "$APPSDIR/netutils/webclient/Kconfig"
-source "$APPSDIR/netutils/webserver/Kconfig"
-source "$APPSDIR/netutils/websocket/Kconfig"
-source "$APPSDIR/netutils/ntpclient/Kconfig"
-source "$APPSDIR/netutils/xmlrpc/Kconfig"
-source "$APPSDIR/netutils/mdns/Kconfig"
-source "$APPSDIR/netutils/wifi/Kconfig"
-source "$APPSDIR/netutils/mqtt/Kconfig"
-source "$APPSDIR/netutils/er-coap/Kconfig"
-endmenu

diff --git a/apps/netutils/Makefile b/apps/netutils/Makefile
index 02533f1..c8c86cd 100644 (file)
--- a/apps/netutils/Makefile
+++ b/apps/netutils/Makefile
@@ -50,4 +50,6 @@
 #
 ############################################################################
 
+MENUDESC = "Network Utilities"
+
 include $(APPDIR)/Directory.mk

diff --git a/apps/netutils/codecs/Makefile b/apps/netutils/codecs/Makefile
index f4149ce..cafb2f6 100644 (file)
--- a/apps/netutils/codecs/Makefile
+++ b/apps/netutils/codecs/Makefile
@@ -111,3 +111,6 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:
+

diff --git a/apps/netutils/dhcpc/Makefile b/apps/netutils/dhcpc/Makefile
index 452148c..7c93c41 100644 (file)
--- a/apps/netutils/dhcpc/Makefile
+++ b/apps/netutils/dhcpc/Makefile
@@ -115,3 +115,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/dhcpd/Makefile b/apps/netutils/dhcpd/Makefile
index b6c901c..8ca0d74 100755 (executable)
--- a/apps/netutils/dhcpd/Makefile
+++ b/apps/netutils/dhcpd/Makefile
@@ -117,3 +117,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/er-coap/Makefile b/apps/netutils/er-coap/Makefile
index be029b9..3347d56 100755 (executable)
--- a/apps/netutils/er-coap/Makefile
+++ b/apps/netutils/er-coap/Makefile
@@ -113,3 +113,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/ftpc/Makefile b/apps/netutils/ftpc/Makefile
index 2a6f387..04e8919 100644 (file)
--- a/apps/netutils/ftpc/Makefile
+++ b/apps/netutils/ftpc/Makefile
@@ -131,3 +131,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/ftpd/Makefile b/apps/netutils/ftpd/Makefile
index 062530e..ba0a9c2 100644 (file)
--- a/apps/netutils/ftpd/Makefile
+++ b/apps/netutils/ftpd/Makefile
@@ -118,3 +118,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/json/Makefile b/apps/netutils/json/Makefile
index c0d8b6b..9ae5da9 100644 (file)
--- a/apps/netutils/json/Makefile
+++ b/apps/netutils/json/Makefile
@@ -111,3 +111,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/mdns/Makefile b/apps/netutils/mdns/Makefile
index 68ffa5c..396d744 100644 (file)
--- a/apps/netutils/mdns/Makefile
+++ b/apps/netutils/mdns/Makefile
@@ -113,3 +113,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/mqtt/Makefile b/apps/netutils/mqtt/Makefile
index b1549a4..299b34c 100644 (file)
--- a/apps/netutils/mqtt/Makefile
+++ b/apps/netutils/mqtt/Makefile
@@ -139,3 +139,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/netlib/Makefile b/apps/netutils/netlib/Makefile
index 1a01180..9b9e455 100644 (file)
--- a/apps/netutils/netlib/Makefile
+++ b/apps/netutils/netlib/Makefile
@@ -142,3 +142,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/ntpclient/Makefile b/apps/netutils/ntpclient/Makefile
index 622bf58..96efac5 100644 (file)
--- a/apps/netutils/ntpclient/Makefile
+++ b/apps/netutils/ntpclient/Makefile
@@ -115,3 +115,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/smtp/Makefile b/apps/netutils/smtp/Makefile
index ef583b9..6bcaf9e 100644 (file)
--- a/apps/netutils/smtp/Makefile
+++ b/apps/netutils/smtp/Makefile
@@ -115,3 +115,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/telnetd/Makefile b/apps/netutils/telnetd/Makefile
index d10c11d..97cf0ca 100644 (file)
--- a/apps/netutils/telnetd/Makefile
+++ b/apps/netutils/telnetd/Makefile
@@ -115,3 +115,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/tftpc/Makefile b/apps/netutils/tftpc/Makefile
index d54b22a..78c7a85 100644 (file)
--- a/apps/netutils/tftpc/Makefile
+++ b/apps/netutils/tftpc/Makefile
@@ -117,3 +117,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/webclient/Makefile b/apps/netutils/webclient/Makefile
index f2a318a..a4b9ce1 100644 (file)
--- a/apps/netutils/webclient/Makefile
+++ b/apps/netutils/webclient/Makefile
@@ -117,3 +117,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/webserver/Makefile b/apps/netutils/webserver/Makefile
index 01c91a9..73635fe 100644 (file)
--- a/apps/netutils/webserver/Makefile
+++ b/apps/netutils/webserver/Makefile
@@ -126,3 +126,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/websocket/Makefile b/apps/netutils/websocket/Makefile
index c0db638..82ca87b 100644 (file)
--- a/apps/netutils/websocket/Makefile
+++ b/apps/netutils/websocket/Makefile
@@ -107,3 +107,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/wifi/Makefile b/apps/netutils/wifi/Makefile
index 4ffca25..fa5b24e 100644 (file)
--- a/apps/netutils/wifi/Makefile
+++ b/apps/netutils/wifi/Makefile
@@ -108,3 +108,5 @@ distclean: clean
 context:
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/netutils/xmlrpc/Makefile b/apps/netutils/xmlrpc/Makefile
index be48667..ae496bc 100644 (file)
--- a/apps/netutils/xmlrpc/Makefile
+++ b/apps/netutils/xmlrpc/Makefile
@@ -116,3 +116,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/platform/Makefile b/apps/platform/Makefile
index 49a3898..f75558d 100644 (file)
--- a/apps/platform/Makefile
+++ b/apps/platform/Makefile
@@ -155,4 +155,5 @@ distclean: clean
        $(Q) $(DIRUNLINK) $(PLATFORMDIR)
 
 -include Make.dep
-
+.PHONY: preconfig
+preconfig:

diff --git a/apps/shell/Makefile b/apps/shell/Makefile
index 514a5a4..823f621 100644 (file)
--- a/apps/shell/Makefile
+++ b/apps/shell/Makefile
@@ -112,3 +112,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/.gitignore b/apps/system/.gitignore
new file mode 100644 (file)
index 0000000..adc504e
--- /dev/null
+++ b/apps/system/.gitignore
@@ -0,0 +1,2 @@
+/Kconfig*
+

diff --git a/apps/system/Kconfig b/apps/system/Kconfig
deleted file mode 100644 (file)
index a57403a..0000000
--- a/apps/system/Kconfig
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see kconfig-language at https://www.kernel.org/doc/Documentation/kbuild/kconfig-language.txt
-#
-
-menu "System Libraries"
-menu "EMACS-like Command Line Editor"
-source "$APPSDIR/system/cle/Kconfig"
-endmenu
-
-menu "CU Minimal Terminal"
-source "$APPSDIR/system/cu/Kconfig"
-endmenu
-
-menu "FLASH Erase-all Command"
-source "$APPSDIR/system/flash_eraseall/Kconfig"
-endmenu
-
-menu "FOTA HAL Application Library"
-source "$APPSDIR/system/fota_hal/Kconfig"
-endmenu
-
-menu "I2C tool"
-source "$APPSDIR/system/i2c/Kconfig"
-endmenu
-
-menu "INI File Parser"
-source "$APPSDIR/system/inifile/Kconfig"
-endmenu
-
-menu "FLASH Program Installation"
-source "$APPSDIR/system/install/Kconfig"
-endmenu
-
-menu "PHY Tool"
-source "$APPSDIR/system/mdio/Kconfig"
-endmenu
-
-menu "System netdb Interface"
-source "$APPSDIR/system/netdb/Kconfig"
-endmenu
-
-menu "Power Off"
-source "$APPSDIR/system/poweroff/Kconfig"
-endmenu
-
-menu "P-Code Support"
-source "$APPSDIR/system/prun/Kconfig"
-endmenu
-
-menu "RAM test"
-source "$APPSDIR/system/ramtest/Kconfig"
-endmenu
-
-menu "RAMTRON"
-source "$APPSDIR/system/ramtron/Kconfig"
-endmenu
-
-menu "readline()"
-source "$APPSDIR/system/readline/Kconfig"
-endmenu
-
-menu "Sysinfo"
-source "$APPSDIR/system/sysinfo/Kconfig"
-endmenu
-
-menu "Utils"
-source "$APPSDIR/system/utils/Kconfig"
-endmenu
-
-menu "VI Work-Alike Editor"
-source "$APPSDIR/system/vi/Kconfig"
-endmenu
-endmenu
-

diff --git a/apps/system/Makefile b/apps/system/Makefile
index d7f45d7..d6057f0 100644 (file)
--- a/apps/system/Makefile
+++ b/apps/system/Makefile
@@ -50,4 +50,6 @@
 #
 ############################################################################
 
+MENUDESC = "System Libraries and Add-Ons"
+
 include $(APPDIR)/Directory.mk

diff --git a/apps/system/cle/Makefile b/apps/system/cle/Makefile
index a793dcc..ae40e76 100644 (file)
--- a/apps/system/cle/Makefile
+++ b/apps/system/cle/Makefile
@@ -119,4 +119,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
-
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/cu/Makefile b/apps/system/cu/Makefile
index 5a34087..5df4697 100644 (file)
--- a/apps/system/cu/Makefile
+++ b/apps/system/cu/Makefile
@@ -148,4 +148,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
-
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/flash_eraseall/Makefile b/apps/system/flash_eraseall/Makefile
index c007948..5c52786 100644 (file)
--- a/apps/system/flash_eraseall/Makefile
+++ b/apps/system/flash_eraseall/Makefile
@@ -157,3 +157,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/fota_hal/Makefile b/apps/system/fota_hal/Makefile
index 11d554a..5161368 100644 (file)
--- a/apps/system/fota_hal/Makefile
+++ b/apps/system/fota_hal/Makefile
@@ -140,3 +140,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/i2c/Makefile b/apps/system/i2c/Makefile
index 4a43acb..e506c04 100644 (file)
--- a/apps/system/i2c/Makefile
+++ b/apps/system/i2c/Makefile
@@ -142,4 +142,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
-
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/inifile/Makefile b/apps/system/inifile/Makefile
index e38fbe6..358f1e1 100644 (file)
--- a/apps/system/inifile/Makefile
+++ b/apps/system/inifile/Makefile
@@ -112,4 +112,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
-
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/init/Makefile b/apps/system/init/Makefile
index d6fbc0b..faee468 100644 (file)
--- a/apps/system/init/Makefile
+++ b/apps/system/init/Makefile
@@ -148,3 +148,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/install/Makefile b/apps/system/install/Makefile
index 4ff56a1..357470e 100644 (file)
--- a/apps/system/install/Makefile
+++ b/apps/system/install/Makefile
@@ -157,3 +157,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/mdio/Makefile b/apps/system/mdio/Makefile
index 24bb7da..4fc6b75 100644 (file)
--- a/apps/system/mdio/Makefile
+++ b/apps/system/mdio/Makefile
@@ -145,3 +145,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/netdb/Makefile b/apps/system/netdb/Makefile
index e864a8b..7c17792 100644 (file)
--- a/apps/system/netdb/Makefile
+++ b/apps/system/netdb/Makefile
@@ -127,3 +127,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/poweroff/Makefile b/apps/system/poweroff/Makefile
index 75322ea..f82f2e4 100644 (file)
--- a/apps/system/poweroff/Makefile
+++ b/apps/system/poweroff/Makefile
@@ -157,3 +157,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/prun/Makefile b/apps/system/prun/Makefile
index 309e0df..d58a9f5 100644 (file)
--- a/apps/system/prun/Makefile
+++ b/apps/system/prun/Makefile
@@ -159,3 +159,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/ramtest/Makefile b/apps/system/ramtest/Makefile
index d01e3a7..3c1abc7 100644 (file)
--- a/apps/system/ramtest/Makefile
+++ b/apps/system/ramtest/Makefile
@@ -150,3 +150,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/ramtron/Makefile b/apps/system/ramtron/Makefile
index cbc8134..14595e5 100644 (file)
--- a/apps/system/ramtron/Makefile
+++ b/apps/system/ramtron/Makefile
@@ -157,3 +157,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/readline/Makefile b/apps/system/readline/Makefile
index 52441e9..9c470eb 100644 (file)
--- a/apps/system/readline/Makefile
+++ b/apps/system/readline/Makefile
@@ -129,3 +129,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/sysinfo/Makefile b/apps/system/sysinfo/Makefile
index 61a81b3..2be6119 100644 (file)
--- a/apps/system/sysinfo/Makefile
+++ b/apps/system/sysinfo/Makefile
@@ -135,3 +135,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/utils/Makefile b/apps/system/utils/Makefile
index cd3e1f8..e35186e 100755 (executable)
--- a/apps/system/utils/Makefile
+++ b/apps/system/utils/Makefile
@@ -209,3 +209,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/system/vi/Makefile b/apps/system/vi/Makefile
index 48547c4..3214d2a 100644 (file)
--- a/apps/system/vi/Makefile
+++ b/apps/system/vi/Makefile
@@ -147,3 +147,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig:

diff --git a/apps/tools/mkkconfig.sh b/apps/tools/mkkconfig.sh
index 4de9eac..d96c2e7 100755 (executable)
--- a/apps/tools/mkkconfig.sh
+++ b/apps/tools/mkkconfig.sh
@@ -102,7 +102,7 @@ fi
 
 echo mkkconfig in $PWD
 
-KCONFIG_LIST=`ls -1 $PWD/*/Kconfig`
+KCONFIG_LIST=`ls -1 $PWD/*/${KCONFIG}`
 
 echo "#" > ${KCONFIG}
 echo "# For a description of the syntax of this configuration file," >> ${KCONFIG}

diff --git a/apps/wpa_supplicant/Makefile b/apps/wpa_supplicant/Makefile
index 3a69b3c..d035f79 100644 (file)
--- a/apps/wpa_supplicant/Makefile
+++ b/apps/wpa_supplicant/Makefile
@@ -227,3 +227,5 @@ distclean: clean
        $(call DELFILE, .depend)
 
 -include Make.dep
+.PHONY: preconfig
+preconfig: