samples: hello world: unify sample and use unified kernel

Change-Id: I4d4124245f394030b19a6b80160685798bd6ae72
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

17 files changed, 20 insertions, 125 deletions

diff --git a/samples/hello_world/nanokernel/Makefile b/samples/hello_world/Makefile
index f2e25a17f..c722d034c 100644
--- a/samples/hello_world/nanokernel/Makefile
+++ b/samples/hello_world/Makefile
@@ -1,4 +1,4 @@
-KERNEL_TYPE = nano
+KERNEL_TYPE = unified
 BOARD ?= qemu_x86
 CONF_FILE = prj.conf
 
diff --git a/samples/hello_world/README.txt b/samples/hello_world/README.txt
new file mode 100644
index 000000000..d7c569a93
--- /dev/null
+++ b/samples/hello_world/README.txt
@@ -0,0 +1,18 @@
+Title: Hello World
+
+Description:
+
+A simple Hello World example
+
+--------------------------------------------------------------------------------
+
+Building and Running Project:
+
+This project outputs 'Hello World' to the console.  It can be built and executed
+on QEMU as follows:
+
+    make qemu
+
+Sample Output:
+
+Hello World! x86
diff --git a/samples/hello_world/microkernel/Makefile b/samples/hello_world/microkernel/Makefile
deleted file mode 100644
index 0d56ce66d..000000000
--- a/samples/hello_world/microkernel/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-BOARD ?= qemu_x86
-CONF_FILE = prj.conf
-
-include ${ZEPHYR_BASE}/Makefile.inc
diff --git a/samples/hello_world/microkernel/README.txt b/samples/hello_world/microkernel/README.txt
deleted file mode 100644
index 1c33d5dd7..000000000
--- a/samples/hello_world/microkernel/README.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Title: Synchronisation
-
-Description:
-
-A simple Hello World example using the microkernel.
-
---------------------------------------------------------------------------------
-
-Building and Running Project:
-
-This microkernel project outputs to the console.  It can be built and executed
-on QEMU as follows:
-
-    make qemu
-
---------------------------------------------------------------------------------
-
-Troubleshooting:
-
-Problems caused by out-dated project information can be addressed by
-issuing one of the following commands then rebuilding the project:
-
-    make clean          # discard results of previous builds
-                        # but keep existing configuration info
-or
-    make pristine       # discard results of previous builds
-                        # and restore pre-defined configuration info
-
---------------------------------------------------------------------------------
-
-Sample Output:
-
-Hello World!
diff --git a/samples/hello_world/microkernel/prj.conf b/samples/hello_world/microkernel/prj.conf
deleted file mode 100644
index 8b042db54..000000000
--- a/samples/hello_world/microkernel/prj.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_STDOUT_CONSOLE=y
diff --git a/samples/hello_world/microkernel/prj.mdef b/samples/hello_world/microkernel/prj.mdef
deleted file mode 100644
index 6c33f7925..000000000
--- a/samples/hello_world/microkernel/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Hello demo
-
-% TASK NAME  PRIO ENTRY STACK GROUPS
-% ==================================
-  TASK TASKA    7 main  2048 [EXE]
diff --git a/samples/hello_world/microkernel/sample.tc b/samples/hello_world/microkernel/sample.tc
deleted file mode 100644
index 83c75a647..000000000
--- a/samples/hello_world/microkernel/sample.tc
+++ /dev/null
@@ -1,7 +0,0 @@
-# @testcase dynamic
-# @tags kernel:micro
-# @targets \
-#    board:(?!arduino_101_sss) \
-#    board:(?!quark_se_c1000_ss_devboard)
-#
-# @eval console-rx %(console)s:5 Hello World! %(bsp)s
diff --git a/samples/hello_world/microkernel/testcase.ini b/samples/hello_world/microkernel/testcase.ini
deleted file mode 100644
index 714c94399..000000000
--- a/samples/hello_world/microkernel/testcase.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[test]
-kernel = micro
-build_only = true
-tags = samples
diff --git a/samples/hello_world/nanokernel/README.txt b/samples/hello_world/nanokernel/README.txt
deleted file mode 100644
index f280d71b5..000000000
--- a/samples/hello_world/nanokernel/README.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Title: Synchronisation
-
-Description:
-
-A simple 'Hello World' application.
---------------------------------------------------------------------------------
-
-Building and Running Project:
-
-This nanokernel project outputs to the console.  It can be built and executed
-on QEMU as follows:
-
-    make qemu
-
---------------------------------------------------------------------------------
-
-Troubleshooting:
-
-Problems caused by out-dated project information can be addressed by
-issuing one of the following commands then rebuilding the project:
-
-    make clean          # discard results of previous builds
-                        # but keep existing configuration info
-or
-    make pristine       # discard results of previous builds
-                        # and restore pre-defined configuration info
-
---------------------------------------------------------------------------------
-
-Sample Output:
-
-Hello World!
diff --git a/samples/hello_world/nanokernel/prj.conf b/samples/hello_world/nanokernel/prj.conf
deleted file mode 100644
index d8f773ce3..000000000
--- a/samples/hello_world/nanokernel/prj.conf
+++ /dev/null
@@ -1 +0,0 @@
-# nothing yet
diff --git a/samples/hello_world/nanokernel/sample.tc b/samples/hello_world/nanokernel/sample.tc
deleted file mode 100644
index 9bb4385dd..000000000
--- a/samples/hello_world/nanokernel/sample.tc
+++ /dev/null
@@ -1,4 +0,0 @@
-# @testcase dynamic
-# @tags kernel:nano
-#
-# @eval console-rx %(console)s:15 Hello World! %(bsp)s
diff --git a/samples/hello_world/nanokernel/src/Makefile b/samples/hello_world/nanokernel/src/Makefile
deleted file mode 100644
index b666967fd..000000000
--- a/samples/hello_world/nanokernel/src/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += main.o
diff --git a/samples/hello_world/nanokernel/src/main.c b/samples/hello_world/nanokernel/src/main.c
deleted file mode 100644
index 5957ee7a8..000000000
--- a/samples/hello_world/nanokernel/src/main.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Wind River Systems, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <zephyr.h>
-#include <misc/printk.h>
-
-/*
- * @file
- * @brief Hello World demo
- * Nanokernel version of hello world demo
- */
-void main(void)
-{
-	printk("Hello World! %s\n", CONFIG_ARCH);
-}
-
diff --git a/samples/hello_world/prj.conf b/samples/hello_world/prj.conf
new file mode 100644
index 000000000..b2a4ba591
--- /dev/null
+++ b/samples/hello_world/prj.conf
@@ -0,0 +1 @@
+# nothing here
diff --git a/samples/hello_world/microkernel/src/Makefile b/samples/hello_world/src/Makefile
index 00066e156..00066e156 100644
--- a/samples/hello_world/microkernel/src/Makefile
+++ b/samples/hello_world/src/Makefile
diff --git a/samples/hello_world/microkernel/src/main.c b/samples/hello_world/src/main.c
index b7e013e7a..b7e013e7a 100644
--- a/samples/hello_world/microkernel/src/main.c
+++ b/samples/hello_world/src/main.c
diff --git a/samples/hello_world/nanokernel/testcase.ini b/samples/hello_world/testcase.ini
index 741207d99..f3fbf9748 100644
--- a/samples/hello_world/nanokernel/testcase.ini
+++ b/samples/hello_world/testcase.ini
@@ -1,4 +1,3 @@
 [test]
-kernel = nano
 build_only = true
 tags = samples