2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>

	* README, include/bsp.h, startup/bspstart.c: Eliminate copies of the
	Configuration Table. Use the RTEMS provided accessor macros to obtain
	configuration fields.

4 files changed, 18 insertions, 23 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog
index b959fa89ca..efb5e7f0bd 100644
--- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen405/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-11	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* README, include/bsp.h, startup/bspstart.c: Eliminate copies of the
+	Configuration Table. Use the RTEMS provided accessor macros to obtain
+	configuration fields.
+
 2007-12-04	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field
diff --git a/c/src/lib/libbsp/powerpc/gen405/README b/c/src/lib/libbsp/powerpc/gen405/README
index 4ab5a71d3c..5002ed04dd 100644
--- a/c/src/lib/libbsp/powerpc/gen405/README
+++ b/c/src/lib/libbsp/powerpc/gen405/README
@@ -44,9 +44,9 @@ Notes
 
 Board description
 -----------------
-clock rate:	234 MHz
-ROM:		16MByte FLASH
-RAM:		64MByte DRAM
+clock rate:234 MHz
+ROM:       16 MByte FLASH
+RAM:       64 MByte DRAM
 
 gen405 only supports single processor operations.
 
@@ -60,20 +60,19 @@ For adapting this BSP to other boards, the following files should be
 modified:
 
 - c/src/lib/libbsp/powerpc/gen405/startup/linkcmds
-	for the memory layout required
+        for the memory layout required
 
 - c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c
-	for adaption of BSP_Configuration. here you can select
-	the clock source for the timers and the serial interface
-	(system clock or external clock pin), the clock rates, initial
-	baud rate and other stuff
+        Here you can select the clock source for the timers and the
+        serial interface (system clock or external clock pin), the clock
+        rates, initial baud rate and other stuff
 
 - c/src/lib/libbsp/powerpc/gen405/include/bsp.h
-	some BSP-related constants
+        some BSP-related constants
 
 The actual drivers are placed in 
 - c/src/lib/libcpu/powerpc/ppc403/*
-	well, they should be generic, so there _should_ be no reason
-	to mess around there (but who knows...)
+        well, they should be generic, so there _should_ be no reason
+        to mess around there (but who knows...)
 
 
diff --git a/c/src/lib/libbsp/powerpc/gen405/include/bsp.h b/c/src/lib/libbsp/powerpc/gen405/include/bsp.h
index 1c1aee5ea9..34dc85303f 100644
--- a/c/src/lib/libbsp/powerpc/gen405/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/gen405/include/bsp.h
@@ -67,8 +67,6 @@ extern "C" {
 
 /* miscellaneous stuff assumed to exist */
 
-extern rtems_configuration_table BSP_Configuration;     /* owned by BSP */
-
 /*
  *  Device Driver Table Entries
  */
diff --git a/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c
index 62f9af6913..8cd5a38eb8 100644
--- a/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c
@@ -64,14 +64,6 @@
 #include <rtems/libcsupport.h>
 #include <ictrl.h>
 
-/*
- *  The original table from the application and our copy of it with
- *  some changes.
- */
-
-extern rtems_configuration_table Configuration;
-rtems_configuration_table  BSP_Configuration;
-char *rtems_progname;
 void *bsp_ram_end = (void *)RAM_END;  /* first addr behind avail. ram area */
 
 /*
@@ -175,8 +167,8 @@ void bsp_start( void )
      -remove RAM_END from bsp.h, this cannot be valid...
       or must be a function call
    */
-  BSP_Configuration.work_space_start = (void *)
-      ((char *)(bsp_ram_end)) - BSP_Configuration.work_space_size;
+  Configuration.work_space_start = (void *)
+      ((char *)(bsp_ram_end)) - rtems_configuration_get_work_space_size();
 
   /*
    *  initialize the device driver parameters