2007-09-05 Daniel Hellstrom <daniel@gaisler.com>

	* Makefile.am, preinstall.am: LEON3 AMBA PnP bus scanning moved to
	shared/amba/amba.c and shared/include/ambapp.h. The AMBA scanning was
	improved to take account for PnP info address translation. This is
	useful when scanning remote AMBA busses for example when a board
	connected with PCI has an AMBA bus that needs to be scanned, before
	the addresses was hard coded. Also, LEON2 now have AMBA PnP bus
	scanning support. By using the new AMBA scanning routines it is
	possible to isolate the AMBA scanning code to ambapp.c, however
	existing drivers should be updated to use them in order to save
	space.

3 files changed, 26 insertions, 1 deletions

diff --git a/c/src/lib/libbsp/sparc/leon2/ChangeLog b/c/src/lib/libbsp/sparc/leon2/ChangeLog
index 64760cfd9b..69190125ba 100644
--- a/c/src/lib/libbsp/sparc/leon2/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon2/ChangeLog
@@ -1,5 +1,18 @@
 2007-09-05	Daniel Hellstrom <daniel@gaisler.com>
 
+	* Makefile.am, preinstall.am: LEON3 AMBA PnP bus scanning moved to
+	shared/amba/amba.c and shared/include/ambapp.h. The AMBA scanning was
+	improved to take account for PnP info address translation. This is
+	useful when scanning remote AMBA busses for example when a board
+	connected with PCI has an AMBA bus that needs to be scanned, before
+	the addresses was hard coded. Also, LEON2 now have AMBA PnP bus
+	scanning support. By using the new AMBA scanning routines it is
+	possible to isolate the AMBA scanning code to ambapp.c, however
+	existing drivers should be updated to use them in order to save
+	space.
+
+2007-09-05	Daniel Hellstrom <daniel@gaisler.com>
+
 	* include/bsp.h: This patch prepares bsp.h so that shared code (new
 	drivers) can easily have small small sections of BSP specific code.
 
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 6760fb218e..94c2f53c2b 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -11,6 +11,7 @@ dist_project_lib_DATA = bsp_specs
 
 include_HEADERS = include/bsp.h
 include_HEADERS += include/tm27.h
+include_HEADERS += ../../sparc/shared/include/ambapp.h
 
 nodist_include_HEADERS = include/bspopts.h
 DISTCLEANFILES = include/bspopts.h
@@ -56,6 +57,11 @@ clock_rel_SOURCES = clock/ckinit.c
 clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
 clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
+noinst_PROGRAMS += amba.rel
+amba_rel_SOURCES = ../../sparc/shared/amba/ambapp.c
+amba_rel_CPPFLAGS = $(AM_CPPFLAGS)
+amba_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
 if HAS_NETWORKING
 noinst_PROGRAMS += leon_smc91111.rel
 leon_smc91111_rel_SOURCES = leon_smc91111/leon_smc91111.c
@@ -79,7 +85,8 @@ endif
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup.rel console.rel clock.rel timer.rel gnatsupp.rel
+libbsp_a_LIBADD = startup.rel console.rel clock.rel timer.rel gnatsupp.rel \
+                  amba.rel
 
 if HAS_NETWORKING
 libbsp_a_LIBADD += leon_open_eth.rel
diff --git a/c/src/lib/libbsp/sparc/leon2/preinstall.am b/c/src/lib/libbsp/sparc/leon2/preinstall.am
index f6ac0a87e6..7099d5fb8c 100644
--- a/c/src/lib/libbsp/sparc/leon2/preinstall.am
+++ b/c/src/lib/libbsp/sparc/leon2/preinstall.am
@@ -52,6 +52,11 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
+# AMBA Plug&Play Bus
+$(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_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)