From 416ec41d408ddaf75cb4f0af4d61cd927183e8d2 Mon Sep 17 00:00:00 2001
From: Till Straumann <strauman@slac.stanford.edu>
Date: Fri, 30 Nov 2007 22:33:30 +0000
Subject: [PATCH] 2007-11-30	Till Straumann <strauman@slac.stanford.edu>

	* shared/startup/bspstart.c: Removed excess /*, replaced
	#ifdef checks for mpc8240 by #ifdef mvme2100; eventually
	there should be run-time checks.
---
 c/src/lib/libbsp/powerpc/ChangeLog                 | 6 ++++++
 c/src/lib/libbsp/powerpc/shared/startup/bspstart.c | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog
index cd53e2be99..c00a8933cd 100644
--- a/c/src/lib/libbsp/powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-30	Till Straumann <strauman@slac.stanford.edu>
+
+	* shared/startup/bspstart.c: Removed excess /*, replaced
+	#ifdef checks for mpc8240 by #ifdef mvme2100; eventually
+	there should be run-time checks.
+
 2007-11-30	Till Straumann <strauman@slac.stanford.edu>
 
 	* shared/motorola/motorola.c: removed excess initializer
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
index 3ab7b30529..86040eba8c 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
@@ -58,7 +58,6 @@ extern void ShowBATS();`
  */
 uint32_t   bsp_clicks_per_usec;
 
-/*
 /*
  * Copy of residuals passed by firmware
  */
@@ -138,7 +137,7 @@ void save_boot_params(RESIDUAL* r3, void *r4, void* r5, char *additional_boot_op
   loaderParam[MAX_LOADER_ADD_PARM - 1] ='\0';
 }
 
-#if defined(mpc8240) || defined(mpc8245)
+#if defined(mvme2100)
 unsigned int EUMBBAR;
 
 /* 
@@ -161,7 +160,7 @@ unsigned int get_eumbbar() {
 void bsp_start( void )
 {
   unsigned char *stack;
-#if !defined(mpc8240) && !defined(mpc8245)
+#if !defined(mvme2100)
   unsigned l2cr;
 #endif
   register uint32_t  intrStack;
@@ -216,7 +215,7 @@ void bsp_start( void )
    */
   L1_caches_enables();
 
-#if !defined(mpc8240) && !defined(mpc8245)
+#if !defined(mvme2100)
   /*
    * Enable L2 Cache. Note that the set_L2CR(L2CR) codes checks for
    * relevant CPU type (mpc750)...