move sample apps to top level directory under samples/

All 'real' sample application now reside under samples/ directly. the nano and micro variants will be under the specific sample directory and not split across the file system. Change-Id: I0ddf929cff7a29749aa4944b4385af058d9cc74c Signed-off-by: Anas Nashif <anas.nashif@intel.com>
10 years ago · 18cc4a8ea3
74 changed files with 10 additions and 13 deletions
--- a/samples/microkernel/apps/cpp_synchronization/Makefile
+++ b/samples/microkernel/apps/cpp_synchronization/Makefile
--- a/samples/microkernel/apps/cpp_synchronization/README.txt
+++ b/samples/microkernel/apps/cpp_synchronization/README.txt
--- a/samples/microkernel/apps/cpp_synchronization/prj.mdef
+++ b/samples/microkernel/apps/cpp_synchronization/prj.mdef
--- a/samples/microkernel/apps/cpp_synchronization/prj_arm.conf
+++ b/samples/microkernel/apps/cpp_synchronization/prj_arm.conf
--- a/samples/microkernel/apps/cpp_synchronization/prj_x86.conf
+++ b/samples/microkernel/apps/cpp_synchronization/prj_x86.conf
--- a/samples/cpp_synchronization/microkernel/src/Makefile
+++ b/samples/cpp_synchronization/microkernel/src/Makefile
--- a/samples/microkernel/apps/cpp_synchronization/src/main.cpp
+++ b/samples/microkernel/apps/cpp_synchronization/src/main.cpp
--- a/samples/microkernel/apps/cpp_synchronization/testcase.ini
+++ b/samples/microkernel/apps/cpp_synchronization/testcase.ini
--- a/samples/nanokernel/apps/cpp_synchronization/Makefile
+++ b/samples/nanokernel/apps/cpp_synchronization/Makefile
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 KERNEL_TYPE = nano
 BOARD ?= qemu_x86
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/apps/cpp_synchronization/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/cpp_synchronization/microkernel/src/
 CONF_FILE = prj.conf


--- a/samples/nanokernel/apps/cpp_synchronization/README.txt
+++ b/samples/nanokernel/apps/cpp_synchronization/README.txt
--- a/samples/nanokernel/apps/cpp_synchronization/prj.conf
+++ b/samples/nanokernel/apps/cpp_synchronization/prj.conf
--- a/samples/microkernel/apps/kernel_event_logger/testcase.ini
+++ b/samples/microkernel/apps/kernel_event_logger/testcase.ini
--- a/samples/microkernel/apps/hello_world/Makefile
+++ b/samples/microkernel/apps/hello_world/Makefile
--- a/samples/microkernel/apps/hello_world/README.txt
+++ b/samples/microkernel/apps/hello_world/README.txt
--- a/samples/microkernel/apps/hello_world/prj.conf
+++ b/samples/microkernel/apps/hello_world/prj.conf
--- a/samples/microkernel/apps/hello_world/prj.mdef
+++ b/samples/microkernel/apps/hello_world/prj.mdef
--- a/samples/microkernel/apps/synchronization/src/Makefile
+++ b/samples/microkernel/apps/synchronization/src/Makefile
--- a/samples/microkernel/apps/hello_world/src/main.c
+++ b/samples/microkernel/apps/hello_world/src/main.c
--- a/samples/nanokernel/apps/hello_world/Makefile
+++ b/samples/nanokernel/apps/hello_world/Makefile
--- a/samples/nanokernel/apps/hello_world/README.txt
+++ b/samples/nanokernel/apps/hello_world/README.txt
--- a/samples/nanokernel/apps/hello_world/prj.conf
+++ b/samples/nanokernel/apps/hello_world/prj.conf
--- a/samples/nanokernel/apps/hello_world/src/Makefile
+++ b/samples/nanokernel/apps/hello_world/src/Makefile
--- a/samples/nanokernel/apps/hello_world/src/main.c
+++ b/samples/nanokernel/apps/hello_world/src/main.c
--- a/samples/microkernel/apps/kernel_event_logger/Makefile
+++ b/samples/microkernel/apps/kernel_event_logger/Makefile
--- a/samples/microkernel/apps/kernel_event_logger/README.txt
+++ b/samples/microkernel/apps/kernel_event_logger/README.txt
--- a/samples/microkernel/apps/kernel_event_logger/prj.mdef
+++ b/samples/microkernel/apps/kernel_event_logger/prj.mdef
--- a/samples/microkernel/apps/kernel_event_logger/prj_arm.conf
+++ b/samples/microkernel/apps/kernel_event_logger/prj_arm.conf
--- a/samples/microkernel/apps/kernel_event_logger/prj_x86.conf
+++ b/samples/microkernel/apps/kernel_event_logger/prj_x86.conf
--- a/samples/kernel_event_logger/microkernel/src/Makefile
+++ b/samples/kernel_event_logger/microkernel/src/Makefile
@ -0,0 +1,3 @@
				@@ -0,0 +1,3 @@
+ccflags-y += -I${ZEPHYR_BASE}/samples/philosophers/microkernel/src
+
+obj-y =  kernel_event_collector_sample.o ../../../philosophers/microkernel/src/phil_fiber.o
--- a/samples/microkernel/apps/kernel_event_logger/src/kernel_event_collector_sample.c
+++ b/samples/microkernel/apps/kernel_event_logger/src/kernel_event_collector_sample.c
--- a/samples/kernel_event_logger/microkernel/testcase.ini
+++ b/samples/kernel_event_logger/microkernel/testcase.ini
--- a/samples/nanokernel/apps/kernel_event_logger/Makefile
+++ b/samples/nanokernel/apps/kernel_event_logger/Makefile
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 KERNEL_TYPE = nano
 BOARD ?= qemu_x86
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/apps/kernel_event_logger/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/kernel_event_logger/microkernel/src/
 CONF_FILE = prj_$(ARCH).conf

 include ${ZEPHYR_BASE}/Makefile.inc
--- a/samples/nanokernel/apps/kernel_event_logger/README.txt
+++ b/samples/nanokernel/apps/kernel_event_logger/README.txt
--- a/samples/nanokernel/apps/kernel_event_logger/prj_arm.conf
+++ b/samples/nanokernel/apps/kernel_event_logger/prj_arm.conf
--- a/samples/nanokernel/apps/kernel_event_logger/prj_x86.conf
+++ b/samples/nanokernel/apps/kernel_event_logger/prj_x86.conf
--- a/samples/nanokernel/apps/kernel_event_logger/testcase.ini
+++ b/samples/nanokernel/apps/kernel_event_logger/testcase.ini
--- a/samples/microkernel/apps/cpp_synchronization/src/Makefile
+++ b/samples/microkernel/apps/cpp_synchronization/src/Makefile
@ -1,4 +0,0 @@
				@@ -1,4 +0,0 @@
-ccflags-y += ${PROJECTINCLUDE}
-cxxflags-y += ${PROJECTINCLUDE}
-
-obj-y = main.o
--- a/samples/microkernel/apps/kernel_event_logger/src/Makefile
+++ b/samples/microkernel/apps/kernel_event_logger/src/Makefile
@ -1,3 +0,0 @@
				@@ -1,3 +0,0 @@
-ccflags-y += -I${ZEPHYR_BASE}/samples/microkernel/apps/philosophers/src
-
-obj-y =  kernel_event_collector_sample.o ../../../../microkernel/apps/philosophers/src/phil_fiber.o
--- a/samples/nanokernel/test/test_build/Makefile
+++ b/samples/nanokernel/test/test_build/Makefile
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 KERNEL_TYPE = nano
 BOARD ?= qemu_x86
 CONF_FILE = debug.conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/nanokernel/apps/synchronization/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/synchronization/nanokernel/src/

 include ${ZEPHYR_BASE}/Makefile.inc
--- a/samples/microkernel/apps/philosophers/Makefile
+++ b/samples/microkernel/apps/philosophers/Makefile
--- a/samples/microkernel/apps/philosophers/README.txt
+++ b/samples/microkernel/apps/philosophers/README.txt
--- a/samples/microkernel/apps/philosophers/prj.mdef
+++ b/samples/microkernel/apps/philosophers/prj.mdef
--- a/samples/microkernel/apps/philosophers/prj_arm.conf
+++ b/samples/microkernel/apps/philosophers/prj_arm.conf
--- a/samples/microkernel/apps/philosophers/prj_x86.conf
+++ b/samples/microkernel/apps/philosophers/prj_x86.conf
--- a/samples/microkernel/apps/philosophers/src/Makefile
+++ b/samples/microkernel/apps/philosophers/src/Makefile
--- a/samples/microkernel/apps/philosophers/src/phil.h
+++ b/samples/microkernel/apps/philosophers/src/phil.h
--- a/samples/microkernel/apps/philosophers/src/phil_fiber.c
+++ b/samples/microkernel/apps/philosophers/src/phil_fiber.c
--- a/samples/microkernel/apps/philosophers/src/phil_task.c
+++ b/samples/microkernel/apps/philosophers/src/phil_task.c
--- a/samples/microkernel/apps/synchronization/testcase.ini
+++ b/samples/microkernel/apps/synchronization/testcase.ini
--- a/samples/nanokernel/apps/philosophers/Makefile
+++ b/samples/nanokernel/apps/philosophers/Makefile
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 KERNEL_TYPE = nano
 BOARD ?= qemu_x86
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/apps/philosophers/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/philosophers/microkernel/src/
 CONF_FILE = prj_$(ARCH).conf

 include ${ZEPHYR_BASE}/Makefile.inc
--- a/samples/nanokernel/apps/philosophers/README.txt
+++ b/samples/nanokernel/apps/philosophers/README.txt
--- a/samples/nanokernel/apps/philosophers/prj_arc.conf
+++ b/samples/nanokernel/apps/philosophers/prj_arc.conf
--- a/samples/nanokernel/apps/philosophers/prj_arm.conf
+++ b/samples/nanokernel/apps/philosophers/prj_arm.conf
--- a/samples/nanokernel/apps/philosophers/prj_x86.conf
+++ b/samples/nanokernel/apps/philosophers/prj_x86.conf
--- a/samples/nanokernel/apps/cpp_synchronization/testcase.ini
+++ b/samples/nanokernel/apps/cpp_synchronization/testcase.ini
--- a/samples/nanokernel/apps/shell/Makefile
+++ b/samples/nanokernel/apps/shell/Makefile
--- a/samples/nanokernel/apps/shell/prj.conf
+++ b/samples/nanokernel/apps/shell/prj.conf
--- a/samples/nanokernel/apps/shell/src/Makefile
+++ b/samples/nanokernel/apps/shell/src/Makefile
--- a/samples/nanokernel/apps/shell/src/main.c
+++ b/samples/nanokernel/apps/shell/src/main.c
--- a/samples/microkernel/apps/synchronization/Makefile
+++ b/samples/microkernel/apps/synchronization/Makefile
--- a/samples/microkernel/apps/synchronization/README.txt
+++ b/samples/microkernel/apps/synchronization/README.txt
--- a/samples/microkernel/apps/synchronization/prj.conf
+++ b/samples/microkernel/apps/synchronization/prj.conf
--- a/samples/microkernel/apps/synchronization/prj.mdef
+++ b/samples/microkernel/apps/synchronization/prj.mdef
--- a/samples/synchronization/microkernel/src/Makefile
+++ b/samples/synchronization/microkernel/src/Makefile
@ -0,0 +1 @@
				@@ -0,0 +1 @@
+obj-y = main.o
--- a/samples/microkernel/apps/synchronization/src/main.c
+++ b/samples/microkernel/apps/synchronization/src/main.c
--- a/samples/nanokernel/apps/philosophers/testcase.ini
+++ b/samples/nanokernel/apps/philosophers/testcase.ini
--- a/samples/nanokernel/apps/synchronization/Makefile
+++ b/samples/nanokernel/apps/synchronization/Makefile
--- a/samples/nanokernel/apps/synchronization/README.txt
+++ b/samples/nanokernel/apps/synchronization/README.txt
--- a/samples/nanokernel/apps/synchronization/prj.conf
+++ b/samples/nanokernel/apps/synchronization/prj.conf
--- a/samples/nanokernel/apps/synchronization/src/Makefile
+++ b/samples/nanokernel/apps/synchronization/src/Makefile
--- a/samples/nanokernel/apps/synchronization/src/main.c
+++ b/samples/nanokernel/apps/synchronization/src/main.c
--- a/samples/nanokernel/apps/synchronization/testcase.ini
+++ b/samples/nanokernel/apps/synchronization/testcase.ini
--- a/tests/drivers/dw_aio_comparator/Makefile
+++ b/tests/drivers/dw_aio_comparator/Makefile
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 KERNEL_TYPE = nano
 BOARD ?= quark_se
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/nanokernel/apps/synchronization/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/synchronization/nanokernel/src/
 CONF_FILE = prj.conf

 include ${ZEPHYR_BASE}/Makefile.inc
--- a/tests/drivers/i2c_quark_se_ss/Makefile
+++ b/tests/drivers/i2c_quark_se_ss/Makefile
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 KERNEL_TYPE = nano
 BOARD ?= arduino_101_sss
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/nanokernel/apps/synchronization/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/synchronization/nanokernel/src/
 CONF_FILE = prj.conf

 include ${ZEPHYR_BASE}/Makefile.inc