diff --git a/samples/microkernel/apps/cpp_synchronization/Makefile b/samples/cpp_synchronization/microkernel/Makefile similarity index 100% rename from samples/microkernel/apps/cpp_synchronization/Makefile rename to samples/cpp_synchronization/microkernel/Makefile diff --git a/samples/microkernel/apps/cpp_synchronization/README.txt b/samples/cpp_synchronization/microkernel/README.txt similarity index 100% rename from samples/microkernel/apps/cpp_synchronization/README.txt rename to samples/cpp_synchronization/microkernel/README.txt diff --git a/samples/microkernel/apps/cpp_synchronization/prj.mdef b/samples/cpp_synchronization/microkernel/prj.mdef similarity index 100% rename from samples/microkernel/apps/cpp_synchronization/prj.mdef rename to samples/cpp_synchronization/microkernel/prj.mdef diff --git a/samples/microkernel/apps/cpp_synchronization/prj_arm.conf b/samples/cpp_synchronization/microkernel/prj_arm.conf similarity index 100% rename from samples/microkernel/apps/cpp_synchronization/prj_arm.conf rename to samples/cpp_synchronization/microkernel/prj_arm.conf diff --git a/samples/microkernel/apps/cpp_synchronization/prj_x86.conf b/samples/cpp_synchronization/microkernel/prj_x86.conf similarity index 100% rename from samples/microkernel/apps/cpp_synchronization/prj_x86.conf rename to samples/cpp_synchronization/microkernel/prj_x86.conf diff --git a/samples/microkernel/apps/hello_world/src/Makefile b/samples/cpp_synchronization/microkernel/src/Makefile similarity index 100% rename from samples/microkernel/apps/hello_world/src/Makefile rename to samples/cpp_synchronization/microkernel/src/Makefile diff --git a/samples/microkernel/apps/cpp_synchronization/src/main.cpp b/samples/cpp_synchronization/microkernel/src/main.cpp similarity index 100% rename from samples/microkernel/apps/cpp_synchronization/src/main.cpp rename to samples/cpp_synchronization/microkernel/src/main.cpp diff --git a/samples/microkernel/apps/cpp_synchronization/testcase.ini b/samples/cpp_synchronization/microkernel/testcase.ini similarity index 100% rename from samples/microkernel/apps/cpp_synchronization/testcase.ini rename to samples/cpp_synchronization/microkernel/testcase.ini diff --git a/samples/nanokernel/apps/cpp_synchronization/Makefile b/samples/cpp_synchronization/nanokernel/Makefile similarity index 55% rename from samples/nanokernel/apps/cpp_synchronization/Makefile rename to samples/cpp_synchronization/nanokernel/Makefile index c97f042f5a5..ed5f0362ec1 100644 --- a/samples/nanokernel/apps/cpp_synchronization/Makefile +++ b/samples/cpp_synchronization/nanokernel/Makefile @@ -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 diff --git a/samples/nanokernel/apps/cpp_synchronization/README.txt b/samples/cpp_synchronization/nanokernel/README.txt similarity index 100% rename from samples/nanokernel/apps/cpp_synchronization/README.txt rename to samples/cpp_synchronization/nanokernel/README.txt diff --git a/samples/nanokernel/apps/cpp_synchronization/prj.conf b/samples/cpp_synchronization/nanokernel/prj.conf similarity index 100% rename from samples/nanokernel/apps/cpp_synchronization/prj.conf rename to samples/cpp_synchronization/nanokernel/prj.conf diff --git a/samples/microkernel/apps/kernel_event_logger/testcase.ini b/samples/cpp_synchronization/nanokernel/testcase.ini similarity index 100% rename from samples/microkernel/apps/kernel_event_logger/testcase.ini rename to samples/cpp_synchronization/nanokernel/testcase.ini diff --git a/samples/microkernel/apps/hello_world/Makefile b/samples/hello_world/microkernel/Makefile similarity index 100% rename from samples/microkernel/apps/hello_world/Makefile rename to samples/hello_world/microkernel/Makefile diff --git a/samples/microkernel/apps/hello_world/README.txt b/samples/hello_world/microkernel/README.txt similarity index 100% rename from samples/microkernel/apps/hello_world/README.txt rename to samples/hello_world/microkernel/README.txt diff --git a/samples/microkernel/apps/hello_world/prj.conf b/samples/hello_world/microkernel/prj.conf similarity index 100% rename from samples/microkernel/apps/hello_world/prj.conf rename to samples/hello_world/microkernel/prj.conf diff --git a/samples/microkernel/apps/hello_world/prj.mdef b/samples/hello_world/microkernel/prj.mdef similarity index 100% rename from samples/microkernel/apps/hello_world/prj.mdef rename to samples/hello_world/microkernel/prj.mdef diff --git a/samples/microkernel/apps/synchronization/src/Makefile b/samples/hello_world/microkernel/src/Makefile similarity index 100% rename from samples/microkernel/apps/synchronization/src/Makefile rename to samples/hello_world/microkernel/src/Makefile diff --git a/samples/microkernel/apps/hello_world/src/main.c b/samples/hello_world/microkernel/src/main.c similarity index 100% rename from samples/microkernel/apps/hello_world/src/main.c rename to samples/hello_world/microkernel/src/main.c diff --git a/samples/nanokernel/apps/hello_world/Makefile b/samples/hello_world/nanokernel/Makefile similarity index 100% rename from samples/nanokernel/apps/hello_world/Makefile rename to samples/hello_world/nanokernel/Makefile diff --git a/samples/nanokernel/apps/hello_world/README.txt b/samples/hello_world/nanokernel/README.txt similarity index 100% rename from samples/nanokernel/apps/hello_world/README.txt rename to samples/hello_world/nanokernel/README.txt diff --git a/samples/nanokernel/apps/hello_world/prj.conf b/samples/hello_world/nanokernel/prj.conf similarity index 100% rename from samples/nanokernel/apps/hello_world/prj.conf rename to samples/hello_world/nanokernel/prj.conf diff --git a/samples/nanokernel/apps/hello_world/src/Makefile b/samples/hello_world/nanokernel/src/Makefile similarity index 100% rename from samples/nanokernel/apps/hello_world/src/Makefile rename to samples/hello_world/nanokernel/src/Makefile diff --git a/samples/nanokernel/apps/hello_world/src/main.c b/samples/hello_world/nanokernel/src/main.c similarity index 100% rename from samples/nanokernel/apps/hello_world/src/main.c rename to samples/hello_world/nanokernel/src/main.c diff --git a/samples/microkernel/apps/kernel_event_logger/Makefile b/samples/kernel_event_logger/microkernel/Makefile similarity index 100% rename from samples/microkernel/apps/kernel_event_logger/Makefile rename to samples/kernel_event_logger/microkernel/Makefile diff --git a/samples/microkernel/apps/kernel_event_logger/README.txt b/samples/kernel_event_logger/microkernel/README.txt similarity index 100% rename from samples/microkernel/apps/kernel_event_logger/README.txt rename to samples/kernel_event_logger/microkernel/README.txt diff --git a/samples/microkernel/apps/kernel_event_logger/prj.mdef b/samples/kernel_event_logger/microkernel/prj.mdef similarity index 100% rename from samples/microkernel/apps/kernel_event_logger/prj.mdef rename to samples/kernel_event_logger/microkernel/prj.mdef diff --git a/samples/microkernel/apps/kernel_event_logger/prj_arm.conf b/samples/kernel_event_logger/microkernel/prj_arm.conf similarity index 100% rename from samples/microkernel/apps/kernel_event_logger/prj_arm.conf rename to samples/kernel_event_logger/microkernel/prj_arm.conf diff --git a/samples/microkernel/apps/kernel_event_logger/prj_x86.conf b/samples/kernel_event_logger/microkernel/prj_x86.conf similarity index 100% rename from samples/microkernel/apps/kernel_event_logger/prj_x86.conf rename to samples/kernel_event_logger/microkernel/prj_x86.conf diff --git a/samples/kernel_event_logger/microkernel/src/Makefile b/samples/kernel_event_logger/microkernel/src/Makefile new file mode 100644 index 00000000000..b670c40330d --- /dev/null +++ b/samples/kernel_event_logger/microkernel/src/Makefile @@ -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 diff --git a/samples/microkernel/apps/kernel_event_logger/src/kernel_event_collector_sample.c b/samples/kernel_event_logger/microkernel/src/kernel_event_collector_sample.c similarity index 100% rename from samples/microkernel/apps/kernel_event_logger/src/kernel_event_collector_sample.c rename to samples/kernel_event_logger/microkernel/src/kernel_event_collector_sample.c diff --git a/samples/microkernel/apps/philosophers/testcase.ini b/samples/kernel_event_logger/microkernel/testcase.ini similarity index 100% rename from samples/microkernel/apps/philosophers/testcase.ini rename to samples/kernel_event_logger/microkernel/testcase.ini diff --git a/samples/nanokernel/apps/kernel_event_logger/Makefile b/samples/kernel_event_logger/nanokernel/Makefile similarity index 56% rename from samples/nanokernel/apps/kernel_event_logger/Makefile rename to samples/kernel_event_logger/nanokernel/Makefile index cda46257716..aa4b4b19dcf 100644 --- a/samples/nanokernel/apps/kernel_event_logger/Makefile +++ b/samples/kernel_event_logger/nanokernel/Makefile @@ -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 diff --git a/samples/nanokernel/apps/kernel_event_logger/README.txt b/samples/kernel_event_logger/nanokernel/README.txt similarity index 100% rename from samples/nanokernel/apps/kernel_event_logger/README.txt rename to samples/kernel_event_logger/nanokernel/README.txt diff --git a/samples/nanokernel/apps/kernel_event_logger/prj_arm.conf b/samples/kernel_event_logger/nanokernel/prj_arm.conf similarity index 100% rename from samples/nanokernel/apps/kernel_event_logger/prj_arm.conf rename to samples/kernel_event_logger/nanokernel/prj_arm.conf diff --git a/samples/nanokernel/apps/kernel_event_logger/prj_x86.conf b/samples/kernel_event_logger/nanokernel/prj_x86.conf similarity index 100% rename from samples/nanokernel/apps/kernel_event_logger/prj_x86.conf rename to samples/kernel_event_logger/nanokernel/prj_x86.conf diff --git a/samples/nanokernel/apps/kernel_event_logger/testcase.ini b/samples/kernel_event_logger/nanokernel/testcase.ini similarity index 100% rename from samples/nanokernel/apps/kernel_event_logger/testcase.ini rename to samples/kernel_event_logger/nanokernel/testcase.ini diff --git a/samples/microkernel/apps/cpp_synchronization/src/Makefile b/samples/microkernel/apps/cpp_synchronization/src/Makefile deleted file mode 100644 index 7d287b5a68f..00000000000 --- a/samples/microkernel/apps/cpp_synchronization/src/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -ccflags-y += ${PROJECTINCLUDE} -cxxflags-y += ${PROJECTINCLUDE} - -obj-y = main.o diff --git a/samples/microkernel/apps/kernel_event_logger/src/Makefile b/samples/microkernel/apps/kernel_event_logger/src/Makefile deleted file mode 100644 index dfb350a006a..00000000000 --- a/samples/microkernel/apps/kernel_event_logger/src/Makefile +++ /dev/null @@ -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 diff --git a/samples/nanokernel/test/test_build/Makefile b/samples/nanokernel/test/test_build/Makefile index 104c1cabbb8..c576ffa0db2 100644 --- a/samples/nanokernel/test/test_build/Makefile +++ b/samples/nanokernel/test/test_build/Makefile @@ -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 diff --git a/samples/microkernel/apps/philosophers/Makefile b/samples/philosophers/microkernel/Makefile similarity index 100% rename from samples/microkernel/apps/philosophers/Makefile rename to samples/philosophers/microkernel/Makefile diff --git a/samples/microkernel/apps/philosophers/README.txt b/samples/philosophers/microkernel/README.txt similarity index 100% rename from samples/microkernel/apps/philosophers/README.txt rename to samples/philosophers/microkernel/README.txt diff --git a/samples/microkernel/apps/philosophers/prj.mdef b/samples/philosophers/microkernel/prj.mdef similarity index 100% rename from samples/microkernel/apps/philosophers/prj.mdef rename to samples/philosophers/microkernel/prj.mdef diff --git a/samples/microkernel/apps/philosophers/prj_arm.conf b/samples/philosophers/microkernel/prj_arm.conf similarity index 100% rename from samples/microkernel/apps/philosophers/prj_arm.conf rename to samples/philosophers/microkernel/prj_arm.conf diff --git a/samples/microkernel/apps/philosophers/prj_x86.conf b/samples/philosophers/microkernel/prj_x86.conf similarity index 100% rename from samples/microkernel/apps/philosophers/prj_x86.conf rename to samples/philosophers/microkernel/prj_x86.conf diff --git a/samples/microkernel/apps/philosophers/src/Makefile b/samples/philosophers/microkernel/src/Makefile similarity index 100% rename from samples/microkernel/apps/philosophers/src/Makefile rename to samples/philosophers/microkernel/src/Makefile diff --git a/samples/microkernel/apps/philosophers/src/phil.h b/samples/philosophers/microkernel/src/phil.h similarity index 100% rename from samples/microkernel/apps/philosophers/src/phil.h rename to samples/philosophers/microkernel/src/phil.h diff --git a/samples/microkernel/apps/philosophers/src/phil_fiber.c b/samples/philosophers/microkernel/src/phil_fiber.c similarity index 100% rename from samples/microkernel/apps/philosophers/src/phil_fiber.c rename to samples/philosophers/microkernel/src/phil_fiber.c diff --git a/samples/microkernel/apps/philosophers/src/phil_task.c b/samples/philosophers/microkernel/src/phil_task.c similarity index 100% rename from samples/microkernel/apps/philosophers/src/phil_task.c rename to samples/philosophers/microkernel/src/phil_task.c diff --git a/samples/microkernel/apps/synchronization/testcase.ini b/samples/philosophers/microkernel/testcase.ini similarity index 100% rename from samples/microkernel/apps/synchronization/testcase.ini rename to samples/philosophers/microkernel/testcase.ini diff --git a/samples/nanokernel/apps/philosophers/Makefile b/samples/philosophers/nanokernel/Makefile similarity index 59% rename from samples/nanokernel/apps/philosophers/Makefile rename to samples/philosophers/nanokernel/Makefile index fd20299c4bd..2a8d6ed0403 100644 --- a/samples/nanokernel/apps/philosophers/Makefile +++ b/samples/philosophers/nanokernel/Makefile @@ -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 diff --git a/samples/nanokernel/apps/philosophers/README.txt b/samples/philosophers/nanokernel/README.txt similarity index 100% rename from samples/nanokernel/apps/philosophers/README.txt rename to samples/philosophers/nanokernel/README.txt diff --git a/samples/nanokernel/apps/philosophers/prj_arc.conf b/samples/philosophers/nanokernel/prj_arc.conf similarity index 100% rename from samples/nanokernel/apps/philosophers/prj_arc.conf rename to samples/philosophers/nanokernel/prj_arc.conf diff --git a/samples/nanokernel/apps/philosophers/prj_arm.conf b/samples/philosophers/nanokernel/prj_arm.conf similarity index 100% rename from samples/nanokernel/apps/philosophers/prj_arm.conf rename to samples/philosophers/nanokernel/prj_arm.conf diff --git a/samples/nanokernel/apps/philosophers/prj_x86.conf b/samples/philosophers/nanokernel/prj_x86.conf similarity index 100% rename from samples/nanokernel/apps/philosophers/prj_x86.conf rename to samples/philosophers/nanokernel/prj_x86.conf diff --git a/samples/nanokernel/apps/cpp_synchronization/testcase.ini b/samples/philosophers/nanokernel/testcase.ini similarity index 100% rename from samples/nanokernel/apps/cpp_synchronization/testcase.ini rename to samples/philosophers/nanokernel/testcase.ini diff --git a/samples/nanokernel/apps/shell/Makefile b/samples/shell/Makefile similarity index 100% rename from samples/nanokernel/apps/shell/Makefile rename to samples/shell/Makefile diff --git a/samples/nanokernel/apps/shell/prj.conf b/samples/shell/prj.conf similarity index 100% rename from samples/nanokernel/apps/shell/prj.conf rename to samples/shell/prj.conf diff --git a/samples/nanokernel/apps/shell/src/Makefile b/samples/shell/src/Makefile similarity index 100% rename from samples/nanokernel/apps/shell/src/Makefile rename to samples/shell/src/Makefile diff --git a/samples/nanokernel/apps/shell/src/main.c b/samples/shell/src/main.c similarity index 100% rename from samples/nanokernel/apps/shell/src/main.c rename to samples/shell/src/main.c diff --git a/samples/microkernel/apps/synchronization/Makefile b/samples/synchronization/microkernel/Makefile similarity index 100% rename from samples/microkernel/apps/synchronization/Makefile rename to samples/synchronization/microkernel/Makefile diff --git a/samples/microkernel/apps/synchronization/README.txt b/samples/synchronization/microkernel/README.txt similarity index 100% rename from samples/microkernel/apps/synchronization/README.txt rename to samples/synchronization/microkernel/README.txt diff --git a/samples/microkernel/apps/synchronization/prj.conf b/samples/synchronization/microkernel/prj.conf similarity index 100% rename from samples/microkernel/apps/synchronization/prj.conf rename to samples/synchronization/microkernel/prj.conf diff --git a/samples/microkernel/apps/synchronization/prj.mdef b/samples/synchronization/microkernel/prj.mdef similarity index 100% rename from samples/microkernel/apps/synchronization/prj.mdef rename to samples/synchronization/microkernel/prj.mdef diff --git a/samples/synchronization/microkernel/src/Makefile b/samples/synchronization/microkernel/src/Makefile new file mode 100644 index 00000000000..00066e15678 --- /dev/null +++ b/samples/synchronization/microkernel/src/Makefile @@ -0,0 +1 @@ +obj-y = main.o diff --git a/samples/microkernel/apps/synchronization/src/main.c b/samples/synchronization/microkernel/src/main.c similarity index 100% rename from samples/microkernel/apps/synchronization/src/main.c rename to samples/synchronization/microkernel/src/main.c diff --git a/samples/nanokernel/apps/philosophers/testcase.ini b/samples/synchronization/microkernel/testcase.ini similarity index 100% rename from samples/nanokernel/apps/philosophers/testcase.ini rename to samples/synchronization/microkernel/testcase.ini diff --git a/samples/nanokernel/apps/synchronization/Makefile b/samples/synchronization/nanokernel/Makefile similarity index 100% rename from samples/nanokernel/apps/synchronization/Makefile rename to samples/synchronization/nanokernel/Makefile diff --git a/samples/nanokernel/apps/synchronization/README.txt b/samples/synchronization/nanokernel/README.txt similarity index 100% rename from samples/nanokernel/apps/synchronization/README.txt rename to samples/synchronization/nanokernel/README.txt diff --git a/samples/nanokernel/apps/synchronization/prj.conf b/samples/synchronization/nanokernel/prj.conf similarity index 100% rename from samples/nanokernel/apps/synchronization/prj.conf rename to samples/synchronization/nanokernel/prj.conf diff --git a/samples/nanokernel/apps/synchronization/src/Makefile b/samples/synchronization/nanokernel/src/Makefile similarity index 100% rename from samples/nanokernel/apps/synchronization/src/Makefile rename to samples/synchronization/nanokernel/src/Makefile diff --git a/samples/nanokernel/apps/synchronization/src/main.c b/samples/synchronization/nanokernel/src/main.c similarity index 100% rename from samples/nanokernel/apps/synchronization/src/main.c rename to samples/synchronization/nanokernel/src/main.c diff --git a/samples/nanokernel/apps/synchronization/testcase.ini b/samples/synchronization/nanokernel/testcase.ini similarity index 100% rename from samples/nanokernel/apps/synchronization/testcase.ini rename to samples/synchronization/nanokernel/testcase.ini diff --git a/tests/drivers/dw_aio_comparator/Makefile b/tests/drivers/dw_aio_comparator/Makefile index bf4f65aad76..6e740377bef 100644 --- a/tests/drivers/dw_aio_comparator/Makefile +++ b/tests/drivers/dw_aio_comparator/Makefile @@ -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 diff --git a/tests/drivers/i2c_quark_se_ss/Makefile b/tests/drivers/i2c_quark_se_ss/Makefile index 76f6c18454f..2e97f8260db 100644 --- a/tests/drivers/i2c_quark_se_ss/Makefile +++ b/tests/drivers/i2c_quark_se_ss/Makefile @@ -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