2004-11-23 Richard Campbell <richard.campbell@oarcorp.com>

	* startup/bspstart.c: Removed mpc824x conditionals around call to
	L1_caches_enables, conditionals are now in mmuAsm.S.
 	* vme/VMEConfig.h: Set up VME A16, A24 and A32 windows at different
	locations for mvme2100.
	* vme/vmeconfig.c: Fixed spelling.

4 files changed, 18 insertions, 9 deletions

diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog
index ad591f11d0..0f0737cdee 100644
--- a/c/src/lib/libbsp/powerpc/shared/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-23	Richard Campbell <richard.campbell@oarcorp.com>
+
+	* startup/bspstart.c: Removed mpc824x conditionals around call to 
+	L1_caches_enables, conditionals are now in mmuAsm.S.
+ 	* vme/VMEConfig.h: Set up VME A16, A24 and A32 windows at different 
+	locations for mvme2100.
+	* vme/vmeconfig.c: Fixed spelling.
+
 2004-11-10	Richard Campbell <richard.campbell@oarcorp.com>
 
 	* ChangeLog, Makefile.am, bootloader/misc.c, bootloader/pci.c,
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
index 5a9ab3e16e..444522f4ae 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
@@ -244,9 +244,7 @@ unsigned int get_eumbbar() {
 void bsp_start( void )
 {
   unsigned char *stack;
-#if !defined(mpc8240) && !defined(mpc8245)
   unsigned l2cr;
-#endif
   register unsigned char* intrStack;
   unsigned char *work_space_start;
   ppc_cpu_id_t myCpu;
@@ -271,7 +269,6 @@ void bsp_start( void )
   { unsigned v = 0x3000 ; _CPU_MSR_SET(v); }
 #endif
 
-#if !defined(mpc8240) && !defined(mpc8245)
   /*
    * enables L1 Cache. Note that the L1_caches_enables() codes checks for
    * relevant CPU type so that the reason why there is no use of myCpu...
@@ -288,7 +285,6 @@ void bsp_start( void )
 #endif  
   if ( (! (l2cr & 0x80000000)) && ((int) l2cr == -1))
     set_L2CR(0xb9A14000);
-#endif
 
   /*
    * the initial stack has already been set to this value in start.S
diff --git a/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h b/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h
index 04347d270a..c075ed2652 100644
--- a/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h
+++ b/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h
@@ -11,10 +11,15 @@
  * hardcoded window lengths that match this
  * layout:
  */
-#define _VME_A32_WIN0_ON_PCI	0x10000000
-#define _VME_A24_ON_PCI			0x1f000000
-#define _VME_A16_ON_PCI			0x1fff0000
-
+#if defined(mvme2100)
+  #define _VME_A32_WIN0_ON_PCI  0x80000000
+  #define _VME_A24_ON_PCI       0x8f000000
+  #define _VME_A16_ON_PCI       0x8fff0000
+#else
+  #define _VME_A32_WIN0_ON_PCI  0x10000000
+  #define _VME_A24_ON_PCI       0x1f000000
+  #define _VME_A16_ON_PCI       0x1fff0000
+#endif
 /* start of the A32 window on the VME bus
  * TODO: this should perhaps be a configuration option
  */
diff --git a/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c b/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c
index 15baf84d15..9daad3194c 100644
--- a/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c
+++ b/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c
@@ -93,7 +93,7 @@ union {
   vmeUniverseMasterPortsShow(0);
   vmeUniverseSlavePortsShow(0);
 
-  /* install the VME insterrupt manager */
+  /* install the VME interrupt manager */
   vmeUniverseInstallIrqMgr(0,5,1,6);
   if (vmeUniverse0PciIrqLine<0)
 	BSP_panic("Unable to get interrupt line info from PCI config");