Merge pull request #48 from SPRESENSE/release-v2.0.0

Merge release-v2.0.0 into master for v2.0.0 release
sonydevworld · Jun 12, 2020 · d2f9e7e · d2f9e7e
2 parents 72d88c3 + 43d6613
commit d2f9e7e
Show file tree

Hide file tree

Showing 1,923 changed files with 33,448 additions and 255,650 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,5 +2,8 @@
 	path = nuttx
 	url = ../spresense-nuttx.git
 [submodule "externals/nnabla-c-runtime"]
-	path = externals/nnabla-c-runtime
+	path = externals/nnablart/nnabla-c-runtime
 	url = https://github.com/sony/nnabla-c-runtime
+[submodule "sdk/apps"]
+	path = sdk/apps
+	url = ../spresense-nuttx-apps.git
diff --git a/LICENSE b/LICENSE
diff --git a/examples/.sdksubdir b/examples/.sdksubdir
@@ -0,0 +1 @@
+
diff --git a/examples/Application.mk b/examples/Application.mk
diff --git a/examples/LibTarget.mk b/examples/LibTarget.mk
diff --git a/examples/Makefile b/examples/Makefile
@@ -35,6 +35,4 @@
 
 MENUDESC = "Examples"
 
-BIN = libexamples$(LIBEXT)
-
-include $(SDKDIR)/Makefile.ext
+include $(SDKDIR)/tools/Sdk.mk
diff --git a/examples/accel/Kconfig b/examples/accel/Kconfig
@@ -4,7 +4,7 @@
 #
 
 config EXAMPLES_ACCEL
-	bool "Accelerometer sensor example"
+	tristate "Accelerometer sensor example"
 	default n
 	---help---
 		Enable the sensor via SCU example
@@ -14,7 +14,6 @@ if EXAMPLES_ACCEL
 config EXAMPLES_ACCEL_PROGNAME
 	string "Program name"
 	default "accel"
-	depends on BUILD_KERNEL
 	---help---
 		This is the name of the program that will be use when the NSH ELF
 		program is installed.

diff --git a/examples/accel/Make.defs b/examples/accel/Make.defs
@@ -33,6 +33,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_EXAMPLES_ACCEL),y)
+ifneq ($(CONFIG_EXAMPLES_ACCEL),)
 CONFIGURED_APPS += accel
 endif
diff --git a/examples/accel/Makefile b/examples/accel/Makefile
@@ -34,23 +34,16 @@
 ############################################################################
 
 -include $(TOPDIR)/Make.defs
--include $(SDKDIR)/Make.defs
 
-# sensor built-in application info
+# Accelerometer sensor built-in application info
 
-CONFIG_EXAMPLES_ACCEL_PRIORITY ?= SCHED_PRIORITY_DEFAULT
-CONFIG_EXAMPLES_ACCEL_STACKSIZE ?= 2048
-
-APPNAME = accel
-PRIORITY = $(CONFIG_EXAMPLES_ACCEL_PRIORITY)
+PROGNAME  = $(CONFIG_EXAMPLES_ACCEL_PROGNAME)
+PRIORITY  = $(CONFIG_EXAMPLES_ACCEL_PRIORITY)
 STACKSIZE = $(CONFIG_EXAMPLES_ACCEL_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_ACCEL)
 
-# sensor Example
+# Accelerometor Sensor Example
 
-ASRCS =
 MAINSRC = accel_main.c
 
-CONFIG_EXAMPLES_ACCEL_PROGNAME ?= accel$(EXEEXT)
-PROGNAME = $(CONFIG_EXAMPLES_ACCEL_PROGNAME)
-
 include $(APPDIR)/Application.mk
diff --git a/examples/accel/accel_main.c b/examples/accel/accel_main.c
@@ -48,7 +48,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#include <arch/chip/cxd56_scu.h>
+#include <arch/chip/scu.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -225,15 +225,12 @@ static void sensing_main(int fd)
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
+
 /****************************************************************************
  * sensor_main
  ****************************************************************************/
 
-#ifdef CONFIG_BUILD_KERNEL
 int main(int argc, FAR char *argv[])
-#else
-int accel_main(int argc, char *argv[])
-#endif
 {
   int fd;
 

diff --git a/examples/adc/Kconfig b/examples/adc/Kconfig
diff --git a/examples/adc/Make.defs b/examples/adc/Make.defs