From e51c4c2989059358c2ce9ff788ba3cd0c6bb49e2 Mon Sep 17 00:00:00 2001
From: Andrew Boie <andrew.p.boie@intel.com>
Date: Mon, 7 Nov 2016 10:29:53 -0800
Subject: [PATCH] kernel: remove old kernel support in v2 code

Change-Id: I3675ff42c9742664351975294f61b920995f0c3a
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
---
 kernel/unified/errno.c                 | 3 +--
 kernel/unified/include/nano_internal.h | 2 --
 kernel/unified/include/wait_q.h        | 3 ---
 kernel/unified/kernel_event_logger.c   | 5 -----
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/kernel/unified/errno.c b/kernel/unified/errno.c
index ea96e34497f..08f27a57a39 100644
--- a/kernel/unified/errno.c
+++ b/kernel/unified/errno.c
@@ -24,13 +24,12 @@
 
 #include <nano_private.h>
 
-#ifdef CONFIG_KERNEL_V2
 /*
  * Define _k_neg_eagain for use in assembly files as errno.h is
  * not assembly language safe.
+ * FIXME: wastes 4 bytes
  */
 const int _k_neg_eagain = -EAGAIN;
-#endif
 
 #ifdef CONFIG_ERRNO
 int *_get_errno(void)
diff --git a/kernel/unified/include/nano_internal.h b/kernel/unified/include/nano_internal.h
index e2a8f65a057..2161216f765 100644
--- a/kernel/unified/include/nano_internal.h
+++ b/kernel/unified/include/nano_internal.h
@@ -25,10 +25,8 @@
 #ifndef _NANO_INTERNAL__H_
 #define _NANO_INTERNAL__H_
 
-#ifdef CONFIG_KERNEL_V2
 #define K_NUM_PRIORITIES \
 	(CONFIG_NUM_COOP_PRIORITIES + CONFIG_NUM_PREEMPT_PRIORITIES + 1)
-#endif
 
 #ifndef _ASMLANGUAGE
 
diff --git a/kernel/unified/include/wait_q.h b/kernel/unified/include/wait_q.h
index 14a8d005627..bfa1108fe10 100644
--- a/kernel/unified/include/wait_q.h
+++ b/kernel/unified/include/wait_q.h
@@ -20,11 +20,8 @@
 #define _kernel_nanokernel_include_wait_q__h_
 
 #include <nano_private.h>
-
-#ifdef CONFIG_KERNEL_V2
 #include <misc/dlist.h>
 #include <ksched.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/kernel/unified/kernel_event_logger.c b/kernel/unified/kernel_event_logger.c
index b5f3b66389d..a92c68e4446 100644
--- a/kernel/unified/kernel_event_logger.c
+++ b/kernel/unified/kernel_event_logger.c
@@ -130,13 +130,8 @@ void _sys_k_event_logger_context_switch(void)
 		ARRAY_SIZE(data));
 }
 
-#ifdef CONFIG_KERNEL_V2
 #define ASSERT_CURRENT_IS_COOP_THREAD() \
 	__ASSERT(_current.prio < 0, "must be a coop thread")
-#else
-#define ASSERT_CURRENT_IS_COOP_THREAD() \
-	__ASSERT(_nanokernel.current->flags & FIBER, "must be a fiber")
-#endif
 
 void sys_k_event_logger_register_as_collector(void)
 {