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

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

4 files changed, 10 insertions, 25 deletions

diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index fd8ac95df6..72a78215b4 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-11	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* include/bsp.h, startup/bspstart.c, startup/bspstart.c.nocache:
+	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>
 
 	* startup/bspstart.c, startup/bspstart.c.nocache: Move
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h b/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
index cebd155b26..341ff12731 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
@@ -71,8 +71,6 @@ extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config, int a
 
 /* miscellaneous stuff assumed to exist */
 
-extern rtems_configuration_table BSP_Configuration;
-
 /*
  *  Device Driver Table Entries
  */
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c
index 691238256c..4bffa675b5 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c
@@ -32,16 +32,7 @@
 SPR_RW(SPRG0)
 SPR_RW(SPRG1)
 
-/*
- *  The original table from the application (in ROM) and our copy of it with
- *  some changes. Configuration is defined in <confdefs.h>. Make sure that
- *  our configuration tables are uninitialized so that they get allocated in
- *  the .bss section (RAM).
- */
-extern rtems_configuration_table Configuration;
 extern unsigned long intrStackPtr;
-rtems_configuration_table  BSP_Configuration;
-char *rtems_progname;
 
 /*
  *  Driver configuration parameters
@@ -195,7 +186,7 @@ void bsp_start(void)
    *  In this case, the memory is not malloc'ed.  It is just
    *  "pulled from the air".
    */
-  BSP_Configuration.work_space_start = (void *)&_WorkspaceBase;
+  Configuration.work_space_start = (void *)&_WorkspaceBase;
 
   /*
    *  initialize the device driver parameters
@@ -237,7 +228,7 @@ void bsp_start(void)
   /*
    * Call this in case we use TERMIOS for console I/O
    */
-  m8xx_uart_reserve_resources( &BSP_Configuration );
+  m8xx_uart_reserve_resources( &Configuration );
 
   m8xx.scc2.sccm=0;
   m8xx.scc2p.rbase=0;
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c.nocache b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c.nocache
index 455c01a9b2..4192dc556b 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c.nocache
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c.nocache
@@ -25,16 +25,6 @@
 #include <rtems/libcsupport.h>
  
 /*
- *  The original table from the application (in ROM) and our copy of it with
- *  some changes. Configuration is defined in <confdefs.h>. Make sure that
- *  our configuration tables are uninitialized so that they get allocated in
- *  the .bss section (RAM).
- */
-extern rtems_configuration_table Configuration;
-rtems_configuration_table  BSP_Configuration;
-char *rtems_progname;
-
-/*
  *  Driver configuration parameters
  */
 uint32_t   bsp_clicks_per_usec;
@@ -153,7 +143,7 @@ void bsp_start(void)
    *  In this case, the memory is not malloc'ed.  It is just
    *  "pulled from the air".
    */
-  BSP_Configuration.work_space_start = (void *)&_WorkspaceBase;
+  Configuration.work_space_start = (void *)&_WorkspaceBase;
 
   /*
    *  initialize the device driver parameters
@@ -177,7 +167,7 @@ void bsp_start(void)
   /* 
    * Call this in case we use TERMIOS for console I/O
    */
-  m8xx_uart_reserve_resources( &BSP_Configuration );
+  m8xx_uart_reserve_resources( &Configuration );
 
   m8xx.scc2.sccm=0;
   m8xx.scc2p.rbase=0;