From fe6191f91a0f0a4c99226ea868893f54885dda7a Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Wed, 15 Apr 2020 16:36:07 +0200
Subject: bsps/leon3: Remove superfluous includes

---
 bsps/sparc/leon3/console/printk_support.c | 9 ++-------
 bsps/sparc/leon3/start/bspstart.c         | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/bsps/sparc/leon3/console/printk_support.c b/bsps/sparc/leon3/console/printk_support.c
index c7811687f3..2d46efce8d 100644
--- a/bsps/sparc/leon3/console/printk_support.c
+++ b/bsps/sparc/leon3/console/printk_support.c
@@ -17,11 +17,8 @@
 
 #include <bsp.h>
 #include <leon.h>
-#include <rtems/libio.h>
+#include <rtems/bspIo.h>
 #include <rtems/sysinit.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <stdio.h>
 #include <grlib/apbuart.h>
 
 int leon3_debug_uart_index __attribute__((weak)) = 0;
@@ -99,8 +96,6 @@ static void bsp_out_char(char c)
  *  To support printk
  */
 
-#include <rtems/bspIo.h>
-
 BSP_output_char_function_type BSP_output_char = bsp_out_char;
 
 static int bsp_in_char(void)
@@ -108,7 +103,7 @@ static int bsp_in_char(void)
   int tmp;
 
   if (leon3_debug_uart == NULL)
-    return EOF;
+    return -1;
 
   while ((tmp = apbuart_inbyte_nonblocking(leon3_debug_uart)) < 0)
     ;
diff --git a/bsps/sparc/leon3/start/bspstart.c b/bsps/sparc/leon3/start/bspstart.c
index e8975618d4..e4c3f1045e 100644
--- a/bsps/sparc/leon3/start/bspstart.c
+++ b/bsps/sparc/leon3/start/bspstart.c
@@ -22,7 +22,6 @@
 #include <bsp.h>
 #include <leon.h>
 #include <bsp/bootcard.h>
-#include <drvmgr/drvmgr.h>
 #include <rtems/sysinit.h>
 
 #if defined(RTEMS_SMP) || defined(RTEMS_MULTIPROCESSING)
-- 
cgit v1.2.3