bsp/leon3: Remove <leon.h> include form <bsp.h>

The <leon.h> header file contains a lot of implementation details.  Hide them
from <bsp.h>.

7 files changed, 9 insertions, 3 deletions

diff --git a/bsps/sparc/leon3/btimer/btimer.c b/bsps/sparc/leon3/btimer/btimer.c
index 40bdeb87bb..9e9f2b02fc 100644
--- a/bsps/sparc/leon3/btimer/btimer.c
+++ b/bsps/sparc/leon3/btimer/btimer.c
@@ -18,7 +18,7 @@
  */
 
 
-#include <bsp.h>
+#include <leon.h>
 #include <rtems/btimer.h>
 
 #if defined(RTEMS_MULTIPROCESSING)
diff --git a/bsps/sparc/leon3/console/console.c b/bsps/sparc/leon3/console/console.c
index d5fff88d18..153907840f 100644
--- a/bsps/sparc/leon3/console/console.c
+++ b/bsps/sparc/leon3/console/console.c
@@ -28,6 +28,7 @@
 
 #include <bsp.h>
 #include <bsp/fatal.h>
+#include <leon.h>
 #include <grlib/apbuart_termios.h>
 #include <rtems/console.h>
 #include <string.h>
diff --git a/bsps/sparc/leon3/include/bsp.h b/bsps/sparc/leon3/include/bsp.h
index 850220d70d..d47f5d2cdf 100644
--- a/bsps/sparc/leon3/include/bsp.h
+++ b/bsps/sparc/leon3/include/bsp.h
@@ -32,7 +32,6 @@
 #include <bsp/default-initial-extension.h>
 
 #include <rtems.h>
-#include <leon.h>
 #include <rtems/irq-extension.h>
 
 #ifdef __cplusplus
diff --git a/bsps/sparc/leon3/include/tm27.h b/bsps/sparc/leon3/include/tm27.h
index 7b73bc4dbd..dda21f558f 100644
--- a/bsps/sparc/leon3/include/tm27.h
+++ b/bsps/sparc/leon3/include/tm27.h
@@ -20,6 +20,9 @@
 #ifndef __tm27_h
 #define __tm27_h
 
+#include <bsp.h>
+#include <leon.h>
+
 /*
  *  Define the interrupt mechanism for Time Test 27
  *
diff --git a/bsps/sparc/leon3/start/bspclean.c b/bsps/sparc/leon3/start/bspclean.c
index e2dff91888..a818e99631 100644
--- a/bsps/sparc/leon3/start/bspclean.c
+++ b/bsps/sparc/leon3/start/bspclean.c
@@ -23,6 +23,8 @@
 #include <bsp/bootcard.h>
 #include <rtems/score/smpimpl.h>
 
+#include <leon.h>
+
 void bsp_fatal_extension(
   rtems_fatal_source source,
   bool always_set_to_false,
diff --git a/bsps/sparc/leon3/start/bspdelay.c b/bsps/sparc/leon3/start/bspdelay.c
index 938a8bdccb..c4a880be6d 100644
--- a/bsps/sparc/leon3/start/bspdelay.c
+++ b/bsps/sparc/leon3/start/bspdelay.c
@@ -14,6 +14,7 @@
  */
 
 #include <bsp.h>
+#include <leon.h>
 
 void rtems_bsp_delay(int usecs)
 {
diff --git a/bsps/sparc/leon3/start/setvec.c b/bsps/sparc/leon3/start/setvec.c
index f9bccd490a..31461893ff 100644
--- a/bsps/sparc/leon3/start/setvec.c
+++ b/bsps/sparc/leon3/start/setvec.c
@@ -33,7 +33,7 @@
  *  European Space Agency.
  */
 
-#include <bsp.h>
+#include <leon.h>
 
 rtems_isr_entry set_vector(                   /* returns old vector */
   rtems_isr_entry     handler,                /* isr routine        */