[PATCH] bsps/sparc: Move header files to include/bsp
Daniel Cederman
cederman at gaisler.com
Mon Mar 24 13:17:47 UTC 2014
---
c/src/lib/libbsp/sparc/erc32/Makefile.am | 10 +-
c/src/lib/libbsp/sparc/erc32/include/bsp.h | 2 +-
c/src/lib/libbsp/sparc/erc32/preinstall.am | 18 +--
c/src/lib/libbsp/sparc/erc32/startup/boardinit.S | 2 +-
c/src/lib/libbsp/sparc/leon2/Makefile.am | 52 +++----
c/src/lib/libbsp/sparc/leon2/cchip/cchip.c | 16 +--
c/src/lib/libbsp/sparc/leon2/include/bsp.h | 2 +-
c/src/lib/libbsp/sparc/leon2/include/cchip.h | 8 +-
c/src/lib/libbsp/sparc/leon2/include/rasta.h | 6 +-
c/src/lib/libbsp/sparc/leon2/pci/pci.c | 2 +-
c/src/lib/libbsp/sparc/leon2/preinstall.am | 144 ++++++++++----------
c/src/lib/libbsp/sparc/leon2/rasta/rasta.c | 16 +--
c/src/lib/libbsp/sparc/leon3/Makefile.am | 32 +++--
c/src/lib/libbsp/sparc/leon3/amba/amba.c | 4 +-
c/src/lib/libbsp/sparc/leon3/clock/ckinit.c | 2 +-
c/src/lib/libbsp/sparc/leon3/console/console.c | 2 +-
.../libbsp/sparc/leon3/console/printk_support.c | 2 +-
c/src/lib/libbsp/sparc/leon3/include/amba.h | 4 +-
c/src/lib/libbsp/sparc/leon3/include/bsp.h | 2 +-
c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h | 2 +-
c/src/lib/libbsp/sparc/leon3/include/cache_.h | 4 +-
c/src/lib/libbsp/sparc/leon3/include/leon.h | 2 +-
.../sparc/leon3/leon_smc91111/leon_smc91111.c | 2 +-
c/src/lib/libbsp/sparc/leon3/pci/pci.c | 2 +-
c/src/lib/libbsp/sparc/leon3/preinstall.am | 114 ++++++++--------
c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c | 2 +-
c/src/lib/libbsp/sparc/leon3/startup/bspreset.c | 2 +-
c/src/lib/libbsp/sparc/leon3/startup/bspstart.c | 2 +-
c/src/lib/libbsp/sparc/leon3/startup/cpucounter.c | 2 +-
c/src/lib/libbsp/sparc/leon3/startup/eirq.c | 2 +-
c/src/lib/libbsp/sparc/shared/1553/b1553brm.c | 4 +-
c/src/lib/libbsp/sparc/shared/1553/b1553brm_pci.c | 4 +-
c/src/lib/libbsp/sparc/shared/amba/ambapp.c | 2 +-
c/src/lib/libbsp/sparc/shared/amba/ambapp_alloc.c | 2 +-
c/src/lib/libbsp/sparc/shared/amba/ambapp_count.c | 2 +-
c/src/lib/libbsp/sparc/shared/amba/ambapp_depth.c | 2 +-
.../libbsp/sparc/shared/amba/ambapp_find_by_idx.c | 2 +-
c/src/lib/libbsp/sparc/shared/amba/ambapp_freq.c | 2 +-
c/src/lib/libbsp/sparc/shared/amba/ambapp_names.c | 4 +-
c/src/lib/libbsp/sparc/shared/amba/ambapp_old.c | 2 +-
c/src/lib/libbsp/sparc/shared/amba/ambapp_parent.c | 2 +-
c/src/lib/libbsp/sparc/shared/amba/ambapp_show.c | 2 +-
c/src/lib/libbsp/sparc/shared/can/grcan.c | 8 +-
c/src/lib/libbsp/sparc/shared/can/grcan_rasta.c | 2 +-
c/src/lib/libbsp/sparc/shared/can/occan.c | 8 +-
c/src/lib/libbsp/sparc/shared/can/occan_pci.c | 2 +-
c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c | 6 +-
c/src/lib/libbsp/sparc/shared/include/ambapp.h | 2 +-
c/src/lib/libbsp/sparc/shared/include/apbuart.h | 2 +-
.../lib/libbsp/sparc/shared/include/apbuart_pci.h | 2 +-
.../libbsp/sparc/shared/include/apbuart_rasta.h | 2 +-
c/src/lib/libbsp/sparc/shared/include/b1553brm.h | 2 +-
.../lib/libbsp/sparc/shared/include/b1553brm_pci.h | 2 +-
.../libbsp/sparc/shared/include/b1553brm_rasta.h | 2 +-
c/src/lib/libbsp/sparc/shared/include/grcan.h | 2 +-
.../lib/libbsp/sparc/shared/include/grcan_rasta.h | 2 +-
c/src/lib/libbsp/sparc/shared/include/grspw.h | 2 +-
c/src/lib/libbsp/sparc/shared/include/grspw_pci.h | 2 +-
.../lib/libbsp/sparc/shared/include/grspw_rasta.h | 2 +-
c/src/lib/libbsp/sparc/shared/include/i2cmst.h | 2 +-
c/src/lib/libbsp/sparc/shared/include/occan.h | 2 +-
c/src/lib/libbsp/sparc/shared/include/occan_pci.h | 2 +-
c/src/lib/libbsp/sparc/shared/pci/pcifinddevice.c | 2 +-
c/src/lib/libbsp/sparc/shared/spw/grspw.c | 6 +-
c/src/lib/libbsp/sparc/shared/spw/grspw_pci.c | 4 +-
c/src/lib/libbsp/sparc/shared/start/start.S | 2 +-
c/src/lib/libbsp/sparc/shared/uart/apbuart.c | 6 +-
c/src/lib/libbsp/sparc/shared/uart/apbuart_pci.c | 4 +-
68 files changed, 289 insertions(+), 283 deletions(-)
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index 1cd3d2f..1d7b32d 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -6,8 +6,10 @@ include_bspdir = $(includedir)/bsp
dist_project_lib_DATA = bsp_specs
+include_bsp_HEADERS =
+
include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
+include_bsp_HEADERS += include/tm27.h
nodist_include_HEADERS = include/bspopts.h
nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
@@ -15,8 +17,8 @@ DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
-include_HEADERS += include/erc32.h
-include_HEADERS += ../../shared/include/coverhd.h
+include_bsp_HEADERS += include/erc32.h
+include_bsp_HEADERS += ../../shared/include/coverhd.h
noinst_LIBRARIES = libbspstart.a
libbspstart_a_SOURCES = ../../sparc/shared/start/start.S
@@ -39,7 +41,7 @@ libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \
libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
# gnatsupp
libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS = ../shared/include/gnatcommon.h
+include_bsp_HEADERS += ../shared/include/gnatcommon.h
# console
libbsp_a_SOURCES += console/erc32_console.c ../../shared/console.c \
../../shared/console_select.c ../../shared/console_control.c \
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/c/src/lib/libbsp/sparc/erc32/include/bsp.h
index 47aefdd..2445372 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/erc32/include/bsp.h
@@ -37,7 +37,7 @@ extern "C" {
#include <rtems.h>
#include <rtems/iosupp.h>
-#include <erc32.h>
+#include <bsp/erc32.h>
#include <rtems/clockdrv.h>
#include <rtems/console.h>
#include <rtems/irq-extension.h>
diff --git a/c/src/lib/libbsp/sparc/erc32/preinstall.am b/c/src/lib/libbsp/sparc/erc32/preinstall.am
index 71ef19e..029f9d2 100644
--- a/c/src/lib/libbsp/sparc/erc32/preinstall.am
+++ b/c/src/lib/libbsp/sparc/erc32/preinstall.am
@@ -41,9 +41,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
+$(PROJECT_INCLUDE)/bsp/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tm27.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tm27.h
$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
@@ -53,13 +53,13 @@ $(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INC
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-$(PROJECT_INCLUDE)/erc32.h: include/erc32.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/erc32.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/erc32.h
+$(PROJECT_INCLUDE)/bsp/erc32.h: include/erc32.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/erc32.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/erc32.h
-$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+$(PROJECT_INCLUDE)/bsp/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/coverhd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/coverhd.h
$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/boardinit.S b/c/src/lib/libbsp/sparc/erc32/startup/boardinit.S
index 2c96af5..eb8a001 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/boardinit.S
+++ b/c/src/lib/libbsp/sparc/erc32/startup/boardinit.S
@@ -5,7 +5,7 @@
*/
#include <rtems/asm.h>
-#include <erc32.h>
+#include <bsp/erc32.h>
.global __bsp_board_init
__bsp_board_init:
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 98bc299..8518837 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -6,25 +6,27 @@ include_bspdir = $(includedir)/bsp
dist_project_lib_DATA = bsp_specs
+include_bsp_HEADERS =
+
include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/rasta.h
-include_HEADERS += include/cchip.h
-include_HEADERS += ../../sparc/shared/include/grspw.h
-include_HEADERS += ../../sparc/shared/include/grspw_pci.h
-include_HEADERS += ../../sparc/shared/include/grspw_rasta.h
-include_HEADERS += ../../sparc/shared/include/occan.h
-include_HEADERS += ../../sparc/shared/include/occan_pci.h
-include_HEADERS += ../../sparc/shared/include/grcan.h
-include_HEADERS += ../../sparc/shared/include/grcan_rasta.h
-include_HEADERS += ../../sparc/shared/include/apbuart.h
-include_HEADERS += ../../sparc/shared/include/apbuart_pci.h
-include_HEADERS += ../../sparc/shared/include/apbuart_rasta.h
-include_HEADERS += ../../sparc/shared/include/b1553brm.h
-include_HEADERS += ../../sparc/shared/include/b1553brm_pci.h
-include_HEADERS += ../../sparc/shared/include/b1553brm_rasta.h
-include_HEADERS += ../../sparc/shared/include/debug_defs.h
-include_HEADERS += ../../sparc/shared/include/pci.h
+include_bsp_HEADERS += include/tm27.h
+include_bsp_HEADERS += include/rasta.h
+include_bsp_HEADERS += include/cchip.h
+include_bsp_HEADERS += ../../sparc/shared/include/grspw.h
+include_bsp_HEADERS += ../../sparc/shared/include/grspw_pci.h
+include_bsp_HEADERS += ../../sparc/shared/include/grspw_rasta.h
+include_bsp_HEADERS += ../../sparc/shared/include/occan.h
+include_bsp_HEADERS += ../../sparc/shared/include/occan_pci.h
+include_bsp_HEADERS += ../../sparc/shared/include/grcan.h
+include_bsp_HEADERS += ../../sparc/shared/include/grcan_rasta.h
+include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h
+include_bsp_HEADERS += ../../sparc/shared/include/apbuart_pci.h
+include_bsp_HEADERS += ../../sparc/shared/include/apbuart_rasta.h
+include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h
+include_bsp_HEADERS += ../../sparc/shared/include/b1553brm_pci.h
+include_bsp_HEADERS += ../../sparc/shared/include/b1553brm_rasta.h
+include_bsp_HEADERS += ../../sparc/shared/include/debug_defs.h
+include_bsp_HEADERS += ../../sparc/shared/include/pci.h
nodist_include_HEADERS = include/bspopts.h
nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
@@ -32,8 +34,8 @@ DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
-include_HEADERS += include/leon.h
-include_HEADERS += ../../shared/include/coverhd.h
+include_bsp_HEADERS += include/leon.h
+include_bsp_HEADERS += ../../shared/include/coverhd.h
noinst_LIBRARIES = libbspstart.a
libbspstart_a_SOURCES = ../../sparc/shared/start/start.S
@@ -56,7 +58,7 @@ libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \
libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
# gnatsupp
libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS = ../shared/include/gnatcommon.h
+include_bsp_HEADERS += ../shared/include/gnatcommon.h
# console
libbsp_a_SOURCES += console/console.c console/debugputs.c
# clock
@@ -77,9 +79,9 @@ libbsp_a_SOURCES += \
../../shared/src/irq-shell.c
# AMBA bus
-include_HEADERS += ../../sparc/shared/include/ambapp.h
-include_HEADERS += ../../sparc/shared/include/ambapp_ids.h
-include_HEADERS += ../../sparc/shared/include/grlib.h
+include_bsp_HEADERS += ../../sparc/shared/include/ambapp.h
+include_bsp_HEADERS += ../../sparc/shared/include/ambapp_ids.h
+include_bsp_HEADERS += ../../sparc/shared/include/grlib.h
libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c
libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_count.c
@@ -113,7 +115,7 @@ libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart.c \
../../sparc/shared/uart/apbuart_pci.c \
../../sparc/shared/uart/apbuart_rasta.c
# I2CMST
-include_HEADERS += ../../sparc/shared/include/i2cmst.h
+include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h
libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c
# timer
diff --git a/c/src/lib/libbsp/sparc/leon2/cchip/cchip.c b/c/src/lib/libbsp/sparc/leon2/cchip/cchip.c
index 241dcdd..05e3e03 100644
--- a/c/src/lib/libbsp/sparc/leon2/cchip/cchip.c
+++ b/c/src/lib/libbsp/sparc/leon2/cchip/cchip.c
@@ -18,16 +18,16 @@
#include <string.h>
#include <rtems.h>
-#include <leon.h>
-#include <ambapp.h>
-#include <pci.h>
+#include <bsp/leon.h>
+#include <bsp/ambapp.h>
+#include <bsp/pci.h>
-#include <b1553brm_pci.h>
-#include <occan_pci.h>
-#include <grspw_pci.h>
-#include <apbuart_pci.h>
+#include <bsp/b1553brm_pci.h>
+#include <bsp/occan_pci.h>
+#include <bsp/grspw_pci.h>
+#include <bsp/apbuart_pci.h>
-#include <cchip.h>
+#include <bsp/cchip.h>
/*
#define DEBUG
diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/c/src/lib/libbsp/sparc/leon2/include/bsp.h
index 85ee883..22c39e7 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/leon2/include/bsp.h
@@ -36,7 +36,7 @@ extern "C" {
#include <bsp/default-initial-extension.h>
#include <rtems.h>
-#include <leon.h>
+#include <bsp/leon.h>
#include <rtems/clockdrv.h>
#include <rtems/console.h>
#include <rtems/irq-extension.h>
diff --git a/c/src/lib/libbsp/sparc/leon2/include/cchip.h b/c/src/lib/libbsp/sparc/leon2/include/cchip.h
index beb9f74..a2b758e 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/cchip.h
+++ b/c/src/lib/libbsp/sparc/leon2/include/cchip.h
@@ -8,10 +8,10 @@
#ifndef __CCHIP_H__
#define __CCHIP_H__
-#include <b1553brm_pci.h>
-#include <occan_pci.h>
-#include <grspw_pci.h>
-#include <apbuart_pci.h>
+#include <bsp/b1553brm_pci.h>
+#include <bsp/occan_pci.h>
+#include <bsp/grspw_pci.h>
+#include <bsp/apbuart_pci.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/leon2/include/rasta.h b/c/src/lib/libbsp/sparc/leon2/include/rasta.h
index 0073ad7..f7b2ade 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/rasta.h
+++ b/c/src/lib/libbsp/sparc/leon2/include/rasta.h
@@ -10,9 +10,9 @@
#include <bsp.h>
-#include <grcan.h>
-#include <b1553brm_rasta.h>
-#include <grspw.h>
+#include <bsp/grcan.h>
+#include <bsp/b1553brm_rasta.h>
+#include <bsp/grspw.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/leon2/pci/pci.c b/c/src/lib/libbsp/sparc/leon2/pci/pci.c
index fcc63df..609f72c 100644
--- a/c/src/lib/libbsp/sparc/leon2/pci/pci.c
+++ b/c/src/lib/libbsp/sparc/leon2/pci/pci.c
@@ -27,7 +27,7 @@
*
*/
-#include <pci.h>
+#include <bsp/pci.h>
#include <rtems/bspIo.h>
#include <stdlib.h>
diff --git a/c/src/lib/libbsp/sparc/leon2/preinstall.am b/c/src/lib/libbsp/sparc/leon2/preinstall.am
index 006bb70..f80080a 100644
--- a/c/src/lib/libbsp/sparc/leon2/preinstall.am
+++ b/c/src/lib/libbsp/sparc/leon2/preinstall.am
@@ -41,77 +41,77 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
+$(PROJECT_INCLUDE)/bsp/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tm27.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tm27.h
-$(PROJECT_INCLUDE)/rasta.h: include/rasta.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rasta.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rasta.h
+$(PROJECT_INCLUDE)/bsp/rasta.h: include/rasta.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/rasta.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/rasta.h
-$(PROJECT_INCLUDE)/cchip.h: include/cchip.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cchip.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/cchip.h
+$(PROJECT_INCLUDE)/bsp/cchip.h: include/cchip.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cchip.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cchip.h
-$(PROJECT_INCLUDE)/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw.h
+$(PROJECT_INCLUDE)/bsp/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw.h
-$(PROJECT_INCLUDE)/grspw_pci.h: ../../sparc/shared/include/grspw_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw_pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw_pci.h
+$(PROJECT_INCLUDE)/bsp/grspw_pci.h: ../../sparc/shared/include/grspw_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_pci.h
-$(PROJECT_INCLUDE)/grspw_rasta.h: ../../sparc/shared/include/grspw_rasta.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw_rasta.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw_rasta.h
+$(PROJECT_INCLUDE)/bsp/grspw_rasta.h: ../../sparc/shared/include/grspw_rasta.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_rasta.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_rasta.h
-$(PROJECT_INCLUDE)/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/occan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/occan.h
+$(PROJECT_INCLUDE)/bsp/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan.h
-$(PROJECT_INCLUDE)/occan_pci.h: ../../sparc/shared/include/occan_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/occan_pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/occan_pci.h
+$(PROJECT_INCLUDE)/bsp/occan_pci.h: ../../sparc/shared/include/occan_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan_pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan_pci.h
-$(PROJECT_INCLUDE)/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grcan.h
+$(PROJECT_INCLUDE)/bsp/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grcan.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grcan.h
-$(PROJECT_INCLUDE)/grcan_rasta.h: ../../sparc/shared/include/grcan_rasta.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grcan_rasta.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grcan_rasta.h
+$(PROJECT_INCLUDE)/bsp/grcan_rasta.h: ../../sparc/shared/include/grcan_rasta.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grcan_rasta.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grcan_rasta.h
-$(PROJECT_INCLUDE)/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart.h
+$(PROJECT_INCLUDE)/bsp/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart.h
-$(PROJECT_INCLUDE)/apbuart_pci.h: ../../sparc/shared/include/apbuart_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart_pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart_pci.h
+$(PROJECT_INCLUDE)/bsp/apbuart_pci.h: ../../sparc/shared/include/apbuart_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart_pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart_pci.h
-$(PROJECT_INCLUDE)/apbuart_rasta.h: ../../sparc/shared/include/apbuart_rasta.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart_rasta.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart_rasta.h
+$(PROJECT_INCLUDE)/bsp/apbuart_rasta.h: ../../sparc/shared/include/apbuart_rasta.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart_rasta.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart_rasta.h
-$(PROJECT_INCLUDE)/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/b1553brm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/b1553brm.h
+$(PROJECT_INCLUDE)/bsp/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm.h
-$(PROJECT_INCLUDE)/b1553brm_pci.h: ../../sparc/shared/include/b1553brm_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/b1553brm_pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/b1553brm_pci.h
+$(PROJECT_INCLUDE)/bsp/b1553brm_pci.h: ../../sparc/shared/include/b1553brm_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm_pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm_pci.h
-$(PROJECT_INCLUDE)/b1553brm_rasta.h: ../../sparc/shared/include/b1553brm_rasta.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/b1553brm_rasta.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/b1553brm_rasta.h
+$(PROJECT_INCLUDE)/bsp/b1553brm_rasta.h: ../../sparc/shared/include/b1553brm_rasta.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm_rasta.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm_rasta.h
-$(PROJECT_INCLUDE)/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/debug_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/debug_defs.h
+$(PROJECT_INCLUDE)/bsp/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/debug_defs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/debug_defs.h
-$(PROJECT_INCLUDE)/pci.h: ../../sparc/shared/include/pci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.h
+$(PROJECT_INCLUDE)/bsp/pci.h: ../../sparc/shared/include/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
@@ -121,13 +121,13 @@ $(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INC
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-$(PROJECT_INCLUDE)/leon.h: include/leon.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.h
+$(PROJECT_INCLUDE)/bsp/leon.h: include/leon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/leon.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/leon.h
-$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+$(PROJECT_INCLUDE)/bsp/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/coverhd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/coverhd.h
$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
@@ -157,19 +157,19 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstam
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-$(PROJECT_INCLUDE)/ambapp.h: ../../sparc/shared/include/ambapp.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp.h
+$(PROJECT_INCLUDE)/bsp/ambapp.h: ../../sparc/shared/include/ambapp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ambapp.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ambapp.h
-$(PROJECT_INCLUDE)/ambapp_ids.h: ../../sparc/shared/include/ambapp_ids.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp_ids.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp_ids.h
+$(PROJECT_INCLUDE)/bsp/ambapp_ids.h: ../../sparc/shared/include/ambapp_ids.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ambapp_ids.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ambapp_ids.h
-$(PROJECT_INCLUDE)/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grlib.h
+$(PROJECT_INCLUDE)/bsp/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grlib.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grlib.h
-$(PROJECT_INCLUDE)/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cmst.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cmst.h
+$(PROJECT_INCLUDE)/bsp/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cmst.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cmst.h
diff --git a/c/src/lib/libbsp/sparc/leon2/rasta/rasta.c b/c/src/lib/libbsp/sparc/leon2/rasta/rasta.c
index 9d70715..2b7ae24 100644
--- a/c/src/lib/libbsp/sparc/leon2/rasta/rasta.c
+++ b/c/src/lib/libbsp/sparc/leon2/rasta/rasta.c
@@ -13,14 +13,14 @@
*/
#include <rtems/bspIo.h>
-#include <pci.h>
-#include <rasta.h>
-#include <ambapp.h>
-#include <grlib.h>
-#include <grcan_rasta.h>
-#include <grspw_rasta.h>
-#include <b1553brm_rasta.h>
-#include <apbuart_rasta.h>
+#include <bsp/pci.h>
+#include <bsp/rasta.h>
+#include <bsp/ambapp.h>
+#include <bsp/grlib.h>
+#include <bsp/grcan_rasta.h>
+#include <bsp/grspw_rasta.h>
+#include <bsp/b1553brm_rasta.h>
+#include <bsp/apbuart_rasta.h>
#include <string.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index a9c1448..33b27a3 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -6,9 +6,11 @@ include_bspdir = $(includedir)/bsp
dist_project_lib_DATA = bsp_specs
+include_bsp_HEADERS =
+
include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += ../../sparc/shared/include/debug_defs.h
+include_bsp_HEADERS += include/tm27.h
+include_bsp_HEADERS += ../../sparc/shared/include/debug_defs.h
nodist_include_HEADERS = include/bspopts.h
nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
@@ -16,8 +18,8 @@ DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
-include_HEADERS += include/leon.h
-include_HEADERS += ../../shared/include/coverhd.h
+include_bsp_HEADERS += include/leon.h
+include_bsp_HEADERS += ../../shared/include/coverhd.h
noinst_LIBRARIES = libbspstart.a
libbspstart_a_SOURCES = ../../sparc/shared/start/start.S
@@ -45,12 +47,12 @@ libbsp_a_SOURCES += startup/cpucounter.c
libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
# gnatsupp
libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS = ../shared/include/gnatcommon.h
+include_bsp_HEADERS += ../shared/include/gnatcommon.h
# AMBA bus
-include_HEADERS += include/amba.h
-include_HEADERS += ../../sparc/shared/include/ambapp.h
-include_HEADERS += ../../sparc/shared/include/ambapp_ids.h
-include_HEADERS += ../../sparc/shared/include/grlib.h
+include_bsp_HEADERS += include/amba.h
+include_bsp_HEADERS += ../../sparc/shared/include/ambapp.h
+include_bsp_HEADERS += ../../sparc/shared/include/ambapp_ids.h
+include_bsp_HEADERS += ../../sparc/shared/include/grlib.h
libbsp_a_SOURCES += amba/amba.c
libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c
@@ -84,35 +86,35 @@ libbsp_a_SOURCES += \
../../shared/src/irq-server.c \
../../shared/src/irq-shell.c
# PCI
-include_HEADERS += ../../sparc/shared/include/pci.h
+include_bsp_HEADERS += ../../sparc/shared/include/pci.h
libbsp_a_SOURCES += pci/pci.c ../../sparc/shared/pci/pcifinddevice.c
# B1553BRM
-include_HEADERS += ../../sparc/shared/include/b1553brm.h \
+include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h \
../../sparc/shared/include/b1553brm_pci.h
libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c \
../../sparc/shared/1553/b1553brm_pci.c
# CAN
-include_HEADERS += ../../sparc/shared/include/occan.h \
+include_bsp_HEADERS += ../../sparc/shared/include/occan.h \
../../sparc/shared/include/occan_pci.h ../../sparc/shared/include/grcan.h
libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \
../../sparc/shared/can/occan_pci.c ../../sparc/shared/can/grcan.c
# SpaceWire
-include_HEADERS += ../../sparc/shared/include/grspw.h \
+include_bsp_HEADERS += ../../sparc/shared/include/grspw.h \
../../sparc/shared/include/grspw_pci.h
libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c \
../../sparc/shared/spw/grspw_pci.c
# UART
-include_HEADERS += ../../sparc/shared/include/apbuart.h \
+include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h \
../../sparc/shared/include/apbuart_pci.h
libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart.c \
../../sparc/shared/uart/apbuart_pci.c
# I2CMST
-include_HEADERS += ../../sparc/shared/include/i2cmst.h
+include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h
libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c
# timer
diff --git a/c/src/lib/libbsp/sparc/leon3/amba/amba.c b/c/src/lib/libbsp/sparc/leon3/amba/amba.c
index 70e703f..072b8a1 100644
--- a/c/src/lib/libbsp/sparc/leon3/amba/amba.c
+++ b/c/src/lib/libbsp/sparc/leon3/amba/amba.c
@@ -13,8 +13,8 @@
#include <bsp.h>
#include <bsp/fatal.h>
-#include <leon.h>
-#include <ambapp.h>
+#include <bsp/leon.h>
+#include <bsp/ambapp.h>
/* AMBA Plug&Play information description.
*
diff --git a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c b/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
index a799908..47ac076 100644
--- a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
+++ b/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
@@ -20,7 +20,7 @@
#include <bsp.h>
#include <bspopts.h>
-#include <ambapp.h>
+#include <bsp/ambapp.h>
#include <rtems/score/profiling.h>
#if SIMSPARC_FAST_IDLE==1
diff --git a/c/src/lib/libbsp/sparc/leon3/console/console.c b/c/src/lib/libbsp/sparc/leon3/console/console.c
index cdfbf2a..b88edd7 100644
--- a/c/src/lib/libbsp/sparc/leon3/console/console.c
+++ b/c/src/lib/libbsp/sparc/leon3/console/console.c
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <assert.h>
#include <rtems/bspIo.h>
-#include <leon.h>
+#include <bsp/leon.h>
#include <rtems/termiostypes.h>
int syscon_uart_index __attribute__((weak)) = 0;
diff --git a/c/src/lib/libbsp/sparc/leon3/console/printk_support.c b/c/src/lib/libbsp/sparc/leon3/console/printk_support.c
index 35fb4b5..4aa4f3b 100644
--- a/c/src/lib/libbsp/sparc/leon3/console/printk_support.c
+++ b/c/src/lib/libbsp/sparc/leon3/console/printk_support.c
@@ -16,7 +16,7 @@
*/
#include <bsp.h>
-#include <leon.h>
+#include <bsp/leon.h>
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/include/amba.h b/c/src/lib/libbsp/sparc/leon3/include/amba.h
index 2bbc333..b8c328c 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/amba.h
+++ b/c/src/lib/libbsp/sparc/leon3/include/amba.h
@@ -31,8 +31,8 @@
#define LEON3_AHB_SLAVES 64
#define LEON3_APB_SLAVES 16
-#include <ambapp.h>
-#include <grlib.h>
+#include <bsp/ambapp.h>
+#include <bsp/grlib.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/c/src/lib/libbsp/sparc/leon3/include/bsp.h
index eb2669e..927c6c8 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/leon3/include/bsp.h
@@ -36,7 +36,7 @@ extern "C" {
#include <bsp/default-initial-extension.h>
#include <rtems.h>
-#include <leon.h>
+#include <bsp/leon.h>
#include <rtems/clockdrv.h>
#include <rtems/console.h>
#include <rtems/irq-extension.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h b/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h
index a5c6884..b955ff0 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h
+++ b/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h
@@ -10,7 +10,7 @@
#ifndef LIBBSP_LEON3_IRQ_CONFIG_H
#define LIBBSP_LEON3_IRQ_CONFIG_H
-#include <leon.h>
+#include <bsp/leon.h>
#define BSP_INTERRUPT_VECTOR_MAX_STD 15 /* Standard IRQ controller */
#define BSP_INTERRUPT_VECTOR_MAX_EXT 31 /* Extended IRQ controller */
diff --git a/c/src/lib/libbsp/sparc/leon3/include/cache_.h b/c/src/lib/libbsp/sparc/leon3/include/cache_.h
index 70c1e2c..52f64b0 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/cache_.h
+++ b/c/src/lib/libbsp/sparc/leon3/include/cache_.h
@@ -15,8 +15,8 @@
#ifndef LEON3_CACHE_H
#define LEON3_CACHE_H
-#include <amba.h>
-#include <leon.h>
+#include <bsp/amba.h>
+#include <bsp/leon.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/leon3/include/leon.h b/c/src/lib/libbsp/sparc/leon3/include/leon.h
index 6d2434d..abb4adb 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/leon.h
+++ b/c/src/lib/libbsp/sparc/leon3/include/leon.h
@@ -24,7 +24,7 @@
#define _INCLUDE_LEON_h
#include <rtems.h>
-#include <amba.h>
+#include <bsp/amba.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
index 5b903eb..a0711c3 100644
--- a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
+++ b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
@@ -8,7 +8,7 @@
#include <bsp.h>
#include <libchip/smc91111exp.h>
#include <rtems/bspIo.h>
-#include <ambapp.h>
+#include <bsp/ambapp.h>
#define SMC91111_BASE_ADDR (void*)0x20000300
#define SMC91111_BASE_IRQ 4
diff --git a/c/src/lib/libbsp/sparc/leon3/pci/pci.c b/c/src/lib/libbsp/sparc/leon3/pci/pci.c
index b36b026..3c1a484 100644
--- a/c/src/lib/libbsp/sparc/leon3/pci/pci.c
+++ b/c/src/lib/libbsp/sparc/leon3/pci/pci.c
@@ -22,7 +22,7 @@
*
*/
-#include <pci.h>
+#include <bsp/pci.h>
#include <stdlib.h>
#include <rtems/bspIo.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/preinstall.am b/c/src/lib/libbsp/sparc/leon3/preinstall.am
index 33e9041..1610c82 100644
--- a/c/src/lib/libbsp/sparc/leon3/preinstall.am
+++ b/c/src/lib/libbsp/sparc/leon3/preinstall.am
@@ -41,13 +41,13 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
+$(PROJECT_INCLUDE)/bsp/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tm27.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tm27.h
-$(PROJECT_INCLUDE)/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/debug_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/debug_defs.h
+$(PROJECT_INCLUDE)/bsp/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/debug_defs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/debug_defs.h
$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
@@ -57,13 +57,13 @@ $(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INC
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-$(PROJECT_INCLUDE)/leon.h: include/leon.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.h
+$(PROJECT_INCLUDE)/bsp/leon.h: include/leon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/leon.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/leon.h
-$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+$(PROJECT_INCLUDE)/bsp/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/coverhd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/coverhd.h
$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
@@ -89,21 +89,21 @@ $(PROJECT_INCLUDE)/bsp/gnatcommon.h: ../shared/include/gnatcommon.h $(PROJECT_IN
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gnatcommon.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-$(PROJECT_INCLUDE)/amba.h: include/amba.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/amba.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/amba.h
+$(PROJECT_INCLUDE)/bsp/amba.h: include/amba.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/amba.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/amba.h
-$(PROJECT_INCLUDE)/ambapp.h: ../../sparc/shared/include/ambapp.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp.h
+$(PROJECT_INCLUDE)/bsp/ambapp.h: ../../sparc/shared/include/ambapp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ambapp.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ambapp.h
-$(PROJECT_INCLUDE)/ambapp_ids.h: ../../sparc/shared/include/ambapp_ids.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp_ids.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp_ids.h
+$(PROJECT_INCLUDE)/bsp/ambapp_ids.h: ../../sparc/shared/include/ambapp_ids.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ambapp_ids.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ambapp_ids.h
-$(PROJECT_INCLUDE)/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grlib.h
+$(PROJECT_INCLUDE)/bsp/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grlib.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grlib.h
$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
@@ -117,47 +117,47 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstam
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-$(PROJECT_INCLUDE)/pci.h: ../../sparc/shared/include/pci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.h
+$(PROJECT_INCLUDE)/bsp/pci.h: ../../sparc/shared/include/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-$(PROJECT_INCLUDE)/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/b1553brm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/b1553brm.h
+$(PROJECT_INCLUDE)/bsp/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm.h
-$(PROJECT_INCLUDE)/b1553brm_pci.h: ../../sparc/shared/include/b1553brm_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/b1553brm_pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/b1553brm_pci.h
+$(PROJECT_INCLUDE)/bsp/b1553brm_pci.h: ../../sparc/shared/include/b1553brm_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm_pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm_pci.h
-$(PROJECT_INCLUDE)/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/occan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/occan.h
+$(PROJECT_INCLUDE)/bsp/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan.h
-$(PROJECT_INCLUDE)/occan_pci.h: ../../sparc/shared/include/occan_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/occan_pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/occan_pci.h
+$(PROJECT_INCLUDE)/bsp/occan_pci.h: ../../sparc/shared/include/occan_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan_pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan_pci.h
-$(PROJECT_INCLUDE)/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grcan.h
+$(PROJECT_INCLUDE)/bsp/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grcan.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grcan.h
-$(PROJECT_INCLUDE)/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw.h
+$(PROJECT_INCLUDE)/bsp/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw.h
-$(PROJECT_INCLUDE)/grspw_pci.h: ../../sparc/shared/include/grspw_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw_pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw_pci.h
+$(PROJECT_INCLUDE)/bsp/grspw_pci.h: ../../sparc/shared/include/grspw_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_pci.h
-$(PROJECT_INCLUDE)/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart.h
+$(PROJECT_INCLUDE)/bsp/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart.h
-$(PROJECT_INCLUDE)/apbuart_pci.h: ../../sparc/shared/include/apbuart_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart_pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart_pci.h
+$(PROJECT_INCLUDE)/bsp/apbuart_pci.h: ../../sparc/shared/include/apbuart_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart_pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart_pci.h
-$(PROJECT_INCLUDE)/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cmst.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cmst.h
+$(PROJECT_INCLUDE)/bsp/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cmst.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cmst.h
diff --git a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c b/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c
index 2470e76..b223e4d 100644
--- a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c
+++ b/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c
@@ -14,7 +14,7 @@
*/
#include <bsp.h>
-#include <leon.h>
+#include <bsp/leon.h>
#include <rtems/bspIo.h>
#include <rtems/score/smpimpl.h>
#include <stdlib.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspreset.c b/c/src/lib/libbsp/sparc/leon3/startup/bspreset.c
index e1430b2..99175cd 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bspreset.c
+++ b/c/src/lib/libbsp/sparc/leon3/startup/bspreset.c
@@ -14,7 +14,7 @@
#include <bsp.h>
#include <bsp/bootcard.h>
-#include <leon.h>
+#include <bsp/leon.h>
#ifdef RTEMS_SMP
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c b/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
index b810b63..f2cecb1 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
+++ b/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
@@ -17,7 +17,7 @@
*/
#include <bsp.h>
-#include <leon.h>
+#include <bsp/leon.h>
#include <rtems/bspIo.h>
#include <bsp/bootcard.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/cpucounter.c b/c/src/lib/libbsp/sparc/leon3/startup/cpucounter.c
index a0cfbd8..436d5d0 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/cpucounter.c
+++ b/c/src/lib/libbsp/sparc/leon3/startup/cpucounter.c
@@ -12,7 +12,7 @@
* http://www.rtems.org/license/LICENSE.
*/
-#include <leon.h>
+#include <bsp/leon.h>
#include <rtems/counter.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/eirq.c b/c/src/lib/libbsp/sparc/leon3/startup/eirq.c
index 7e8eb03..3147a9f 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/eirq.c
+++ b/c/src/lib/libbsp/sparc/leon3/startup/eirq.c
@@ -10,7 +10,7 @@
*
*/
-#include <leon.h>
+#include <bsp/leon.h>
/* GRLIB extended IRQ controller IRQ number */
int LEON3_IrqCtrl_EIrq = -1;
diff --git a/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c b/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c
index 045146a..dbe47ef 100644
--- a/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c
+++ b/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c
@@ -59,8 +59,8 @@
#include <ctype.h>
#include <rtems/bspIo.h>
-#include <b1553brm.h>
-#include <ambapp.h>
+#include <bsp/b1553brm.h>
+#include <bsp/ambapp.h>
/* Uncomment for debug output */
/*#define DEBUG 1
diff --git a/c/src/lib/libbsp/sparc/shared/1553/b1553brm_pci.c b/c/src/lib/libbsp/sparc/shared/1553/b1553brm_pci.c
index 2ae4af5..8989c11 100644
--- a/c/src/lib/libbsp/sparc/shared/1553/b1553brm_pci.c
+++ b/c/src/lib/libbsp/sparc/shared/1553/b1553brm_pci.c
@@ -1,5 +1,5 @@
-#include <ambapp.h>
-#include <b1553brm_pci.h>
+#include <bsp/ambapp.h>
+#include <bsp/b1553brm_pci.h>
/* Select PCI driver */
#define B1553BRM_NO_AMBA
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp.c
index dba56c1..bfd9b2a 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp.c
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include <string.h>
-#include <ambapp.h>
+#include <bsp/ambapp.h>
#include <bsp.h>
#define AMBA_CONF_AREA 0xff000
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp_alloc.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp_alloc.c
index 2357f69..e28f32b 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp_alloc.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp_alloc.c
@@ -9,7 +9,7 @@
* http://www.rtems.org/license/LICENSE.
*/
-#include <ambapp.h>
+#include <bsp/ambapp.h>
int ambapp_alloc_dev(struct ambapp_dev *dev, void *owner)
{
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp_count.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp_count.c
index 4e3a1dc..61463cf 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp_count.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp_count.c
@@ -9,7 +9,7 @@
* http://www.rtems.org/license/LICENSE.
*/
-#include <ambapp.h>
+#include <bsp/ambapp.h>
/* Get number of devices matching search options */
int ambapp_dev_count(struct ambapp_bus *abus, unsigned int options,
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp_depth.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp_depth.c
index 8a96afb..1edaac5 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp_depth.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp_depth.c
@@ -9,7 +9,7 @@
* http://www.rtems.org/license/LICENSE.
*/
-#include <ambapp.h>
+#include <bsp/ambapp.h>
/* Get bus depth a device is located at */
int ambapp_depth(struct ambapp_dev *dev)
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp_find_by_idx.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp_find_by_idx.c
index 6b2d288..a397a8f 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp_find_by_idx.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp_find_by_idx.c
@@ -9,7 +9,7 @@
* http://www.rtems.org/license/LICENSE.
*/
-#include <ambapp.h>
+#include <bsp/ambapp.h>
/* AMBAPP helper routine to find a device by index. The function is given to
* ambapp_for_each, the argument may be NULL (find first device) or a pointer
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp_freq.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp_freq.c
index 59db15f..9c09536 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp_freq.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp_freq.c
@@ -9,7 +9,7 @@
* http://www.rtems.org/license/LICENSE.
*/
-#include <ambapp.h>
+#include <bsp/ambapp.h>
/* Calculate AHB Bus frequency of
* - Bus[0] (inverse=1), relative to the frequency of Bus[ahbidx]
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp_names.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp_names.c
index 3bcb0fd..aef8758 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp_names.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp_names.c
@@ -12,8 +12,8 @@
* http://www.rtems.org/license/LICENSE.
*/
-#include <ambapp.h>
-#include <ambapp_ids.h>
+#include <bsp/ambapp.h>
+#include <bsp/ambapp_ids.h>
#include <string.h>
#ifndef NULL
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp_old.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp_old.c
index 2be77a4..6695a7e 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp_old.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp_old.c
@@ -9,7 +9,7 @@
* http://www.rtems.org/license/LICENSE.
*/
-#include <ambapp.h>
+#include <bsp/ambapp.h>
struct ambapp_dev_find_match_arg {
int index;
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp_parent.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp_parent.c
index 6064b4a..6992022 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp_parent.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp_parent.c
@@ -10,7 +10,7 @@
*/
#include <stdlib.h>
-#include <ambapp.h>
+#include <bsp/ambapp.h>
struct ambapp_dev *ambapp_find_parent(struct ambapp_dev *dev)
{
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp_show.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp_show.c
index 1ed15c6..0c1666a 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp_show.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp_show.c
@@ -10,7 +10,7 @@
*/
#include <stdio.h>
-#include <ambapp.h>
+#include <bsp/ambapp.h>
struct ambapp_dev_print_arg {
int show_depth;
diff --git a/c/src/lib/libbsp/sparc/shared/can/grcan.c b/c/src/lib/libbsp/sparc/shared/can/grcan.c
index 1fdd7e8..46e97d5 100644
--- a/c/src/lib/libbsp/sparc/shared/can/grcan.c
+++ b/c/src/lib/libbsp/sparc/shared/can/grcan.c
@@ -24,9 +24,9 @@
#include <ctype.h>
#include <rtems/bspIo.h>
-#include <grcan.h>
-#include <ambapp.h>
-#include <grlib.h>
+#include <bsp/grcan.h>
+#include <bsp/ambapp.h>
+#include <bsp/grlib.h>
#define WRAP_AROUND_TX_MSGS 1
#define WRAP_AROUND_RX_MSGS 2
@@ -109,7 +109,7 @@
#define DEBUG
#define DEBUGFUNCS
*/
-#include <debug_defs.h>
+#include <bsp/debug_defs.h>
/*********************************************************/
diff --git a/c/src/lib/libbsp/sparc/shared/can/grcan_rasta.c b/c/src/lib/libbsp/sparc/shared/can/grcan_rasta.c
index 5f7257a..bfd046f 100644
--- a/c/src/lib/libbsp/sparc/shared/can/grcan_rasta.c
+++ b/c/src/lib/libbsp/sparc/shared/can/grcan_rasta.c
@@ -1,4 +1,4 @@
-#include <rasta.h>
+#include <bsp/rasta.h>
/* PCI frequency */
#define SYS_FREQ_HZ 30000000
diff --git a/c/src/lib/libbsp/sparc/shared/can/occan.c b/c/src/lib/libbsp/sparc/shared/can/occan.c
index 5920af3..98b8c7a 100644
--- a/c/src/lib/libbsp/sparc/shared/can/occan.c
+++ b/c/src/lib/libbsp/sparc/shared/can/occan.c
@@ -17,10 +17,10 @@
#include <bsp.h>
#include <rtems/bspIo.h> /* printk */
-#include <leon.h>
-#include <ambapp.h>
-#include <grlib.h>
-#include <occan.h>
+#include <bsp/leon.h>
+#include <bsp/ambapp.h>
+#include <bsp/grlib.h>
+#include <bsp/occan.h>
/* RTEMS -> ERRNO decoding table
diff --git a/c/src/lib/libbsp/sparc/shared/can/occan_pci.c b/c/src/lib/libbsp/sparc/shared/can/occan_pci.c
index 12273c9..d64f5fa 100644
--- a/c/src/lib/libbsp/sparc/shared/can/occan_pci.c
+++ b/c/src/lib/libbsp/sparc/shared/can/occan_pci.c
@@ -3,7 +3,7 @@
*/
#define OCCAN_WORD_REGS
-#include <occan_pci.h>
+#include <bsp/occan_pci.h>
/* Set registered device name */
#define OCCAN_DEVNAME "/dev/occanpci0"
diff --git a/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c b/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c
index 02710e1..ee909e7 100644
--- a/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c
+++ b/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c
@@ -15,9 +15,9 @@
#include <bsp.h>
-#include <i2cmst.h>
-#include <ambapp.h>
-#include <grlib.h>
+#include <bsp/i2cmst.h>
+#include <bsp/ambapp.h>
+#include <bsp/grlib.h>
#include <rtems/libi2c.h>
/* Enable debug printks? */
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp.h b/c/src/lib/libbsp/sparc/shared/include/ambapp.h
index 338602e..1d650ea 100644
--- a/c/src/lib/libbsp/sparc/shared/include/ambapp.h
+++ b/c/src/lib/libbsp/sparc/shared/include/ambapp.h
@@ -19,7 +19,7 @@
#define __AMBAPP_H__
/* Include VENDOR and DEVICE definitions */
-#include <ambapp_ids.h>
+#include <bsp/ambapp_ids.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart.h b/c/src/lib/libbsp/sparc/shared/include/apbuart.h
index 139d1ec..9c912cc 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart.h
+++ b/c/src/lib/libbsp/sparc/shared/include/apbuart.h
@@ -19,7 +19,7 @@
#ifndef __APBUART_H__
#define __APBUART_H__
-#include <ambapp.h>
+#include <bsp/ambapp.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_pci.h b/c/src/lib/libbsp/sparc/shared/include/apbuart_pci.h
index d2d8bf0..7bbe8ac 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart_pci.h
+++ b/c/src/lib/libbsp/sparc/shared/include/apbuart_pci.h
@@ -17,7 +17,7 @@
#ifndef __APBUART_PCI_H__
#define __APBUART_PCI_H__
-#include <apbuart.h>
+#include <bsp/apbuart.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_rasta.h b/c/src/lib/libbsp/sparc/shared/include/apbuart_rasta.h
index d502970..9487c37 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart_rasta.h
+++ b/c/src/lib/libbsp/sparc/shared/include/apbuart_rasta.h
@@ -17,7 +17,7 @@
#ifndef __APBUART_RASTA_H__
#define __APBUART_RASTA_H__
-#include <apbuart.h>
+#include <bsp/apbuart.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h b/c/src/lib/libbsp/sparc/shared/include/b1553brm.h
index 2cc5b8b..3ea4ee3 100644
--- a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h
+++ b/c/src/lib/libbsp/sparc/shared/include/b1553brm.h
@@ -19,7 +19,7 @@
#ifndef __B1553BRM_H__
#define __B1553BRM_H__
-#include <ambapp.h>
+#include <bsp/ambapp.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm_pci.h b/c/src/lib/libbsp/sparc/shared/include/b1553brm_pci.h
index e7ed277..2be9847 100644
--- a/c/src/lib/libbsp/sparc/shared/include/b1553brm_pci.h
+++ b/c/src/lib/libbsp/sparc/shared/include/b1553brm_pci.h
@@ -17,7 +17,7 @@
#ifndef __B1553BRM_PCI_H__
#define __B1553BRM_PCI_H__
-#include <b1553brm.h>
+#include <bsp/b1553brm.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm_rasta.h b/c/src/lib/libbsp/sparc/shared/include/b1553brm_rasta.h
index 179660d..bc3e3bf 100644
--- a/c/src/lib/libbsp/sparc/shared/include/b1553brm_rasta.h
+++ b/c/src/lib/libbsp/sparc/shared/include/b1553brm_rasta.h
@@ -17,7 +17,7 @@
#ifndef __B1553BRM_RASTA_H__
#define __B1553BRM_RASTA_H__
-#include <b1553brm.h>
+#include <bsp/b1553brm.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/grcan.h b/c/src/lib/libbsp/sparc/shared/include/grcan.h
index e76dee7..91f2108 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grcan.h
+++ b/c/src/lib/libbsp/sparc/shared/include/grcan.h
@@ -19,7 +19,7 @@
#ifndef __GRCAN_H__
#define __GRCAN_H__
-#include <ambapp.h>
+#include <bsp/ambapp.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/grcan_rasta.h b/c/src/lib/libbsp/sparc/shared/include/grcan_rasta.h
index dd5ef95..baa3ef9 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grcan_rasta.h
+++ b/c/src/lib/libbsp/sparc/shared/include/grcan_rasta.h
@@ -7,7 +7,7 @@
#ifndef __GRCAN_RASTA_H__
#define __GRCAN_RASTA_H__
-#include <grcan.h>
+#include <bsp/grcan.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw.h b/c/src/lib/libbsp/sparc/shared/include/grspw.h
index 77495be..3e6f447 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw.h
+++ b/c/src/lib/libbsp/sparc/shared/include/grspw.h
@@ -18,7 +18,7 @@
#ifndef __GRSPW_H__
#define __GRSPW_H__
-#include <ambapp.h>
+#include <bsp/ambapp.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_pci.h b/c/src/lib/libbsp/sparc/shared/include/grspw_pci.h
index 0e1c6f9..d3b657d 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw_pci.h
+++ b/c/src/lib/libbsp/sparc/shared/include/grspw_pci.h
@@ -17,7 +17,7 @@
#ifndef __GRSPW_PCI_H__
#define __GRSPW_PCI_H__
-#include <grspw.h>
+#include <bsp/grspw.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_rasta.h b/c/src/lib/libbsp/sparc/shared/include/grspw_rasta.h
index 1d33603..1ab8439 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw_rasta.h
+++ b/c/src/lib/libbsp/sparc/shared/include/grspw_rasta.h
@@ -17,7 +17,7 @@
#ifndef __GRSPW_RASTA_H__
#define __GRSPW_RASTA_H__
-#include <grspw.h>
+#include <bsp/grspw.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h b/c/src/lib/libbsp/sparc/shared/include/i2cmst.h
index 2db5cd0..ee95e65 100644
--- a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h
+++ b/c/src/lib/libbsp/sparc/shared/include/i2cmst.h
@@ -20,7 +20,7 @@
#define _I2CMST_H
#include <rtems/libi2c.h>
-#include <ambapp.h>
+#include <bsp/ambapp.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/occan.h b/c/src/lib/libbsp/sparc/shared/include/occan.h
index 0217446..e34c348 100644
--- a/c/src/lib/libbsp/sparc/shared/include/occan.h
+++ b/c/src/lib/libbsp/sparc/shared/include/occan.h
@@ -19,7 +19,7 @@
#ifndef __OCCAN_H__
#define __OCCAN_H__
-#include <ambapp.h>
+#include <bsp/ambapp.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/occan_pci.h b/c/src/lib/libbsp/sparc/shared/include/occan_pci.h
index d3c6d1b..601145c 100644
--- a/c/src/lib/libbsp/sparc/shared/include/occan_pci.h
+++ b/c/src/lib/libbsp/sparc/shared/include/occan_pci.h
@@ -17,7 +17,7 @@
#ifndef __OCCAN_PCI_H__
#define __OCCAN_PCI_H__
-#include <occan.h>
+#include <bsp/occan.h>
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/pci/pcifinddevice.c b/c/src/lib/libbsp/sparc/shared/pci/pcifinddevice.c
index bd05aab..1378b45 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/pcifinddevice.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/pcifinddevice.c
@@ -4,7 +4,7 @@
* (we assume, the firmware configured the PCI bus[es] for us)
*/
-#include <pci.h>
+#include <bsp/pci.h>
#include <rtems/bspIo.h>
int
diff --git a/c/src/lib/libbsp/sparc/shared/spw/grspw.c b/c/src/lib/libbsp/sparc/shared/spw/grspw.c
index b311500..5f7c477 100644
--- a/c/src/lib/libbsp/sparc/shared/spw/grspw.c
+++ b/c/src/lib/libbsp/sparc/shared/spw/grspw.c
@@ -84,9 +84,9 @@
#include <assert.h>
#include <ctype.h>
#include <rtems/bspIo.h>
-#include <ambapp.h>
-#include <grlib.h>
-#include <grspw.h>
+#include <bsp/ambapp.h>
+#include <bsp/grlib.h>
+#include <bsp/grspw.h>
#define DBGSPW_IOCALLS 1
#define DBGSPW_TX 2
diff --git a/c/src/lib/libbsp/sparc/shared/spw/grspw_pci.c b/c/src/lib/libbsp/sparc/shared/spw/grspw_pci.c
index fce2fa8..0605432 100644
--- a/c/src/lib/libbsp/sparc/shared/spw/grspw_pci.c
+++ b/c/src/lib/libbsp/sparc/shared/spw/grspw_pci.c
@@ -1,6 +1,6 @@
-#include <ambapp.h>
+#include <bsp/ambapp.h>
#include <rtems/libio.h>
-#include <grspw_pci.h>
+#include <bsp/grspw_pci.h>
/* Select PCI driver */
#define GRSPW_PCI
diff --git a/c/src/lib/libbsp/sparc/shared/start/start.S b/c/src/lib/libbsp/sparc/shared/start/start.S
index 3df9d47..416b147 100644
--- a/c/src/lib/libbsp/sparc/shared/start/start.S
+++ b/c/src/lib/libbsp/sparc/shared/start/start.S
@@ -256,7 +256,7 @@ cpu0:
#if ENABLE_SIS_QUIRKS==1
-#include <erc32.h>
+#include <bsp/erc32.h>
/* Check if MEC is initialised. If not, this means that we are
running on the simulator. Initiate some of the parameters
diff --git a/c/src/lib/libbsp/sparc/shared/uart/apbuart.c b/c/src/lib/libbsp/sparc/shared/uart/apbuart.c
index e64784f..0b0cc67 100644
--- a/c/src/lib/libbsp/sparc/shared/uart/apbuart.c
+++ b/c/src/lib/libbsp/sparc/shared/uart/apbuart.c
@@ -21,9 +21,9 @@
#include <rtems/bspIo.h>
#include <string.h>
-#include <ambapp.h>
-#include <grlib.h>
-#include <apbuart.h>
+#include <bsp/ambapp.h>
+#include <bsp/grlib.h>
+#include <bsp/apbuart.h>
#ifndef DEFAULT_TXBUF_SIZE
#define DEFAULT_TXBUF_SIZE 32
diff --git a/c/src/lib/libbsp/sparc/shared/uart/apbuart_pci.c b/c/src/lib/libbsp/sparc/shared/uart/apbuart_pci.c
index 9ea3967..fd3046b 100644
--- a/c/src/lib/libbsp/sparc/shared/uart/apbuart_pci.c
+++ b/c/src/lib/libbsp/sparc/shared/uart/apbuart_pci.c
@@ -1,5 +1,5 @@
-#include <ambapp.h>
-#include <apbuart_pci.h>
+#include <bsp/ambapp.h>
+#include <bsp/apbuart_pci.h>
#undef DEBUG
--
1.7.9.5
More information about the devel
mailing list