From 17d704eb9544a35dedd2cd8b744f7a8c0b381b1b Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sat, 10 Apr 2004 20:43:50 +0000
Subject: [PATCH] Cleanup for release 1.1.0

---
 Makefile        | 10 +++++++---
 lib_ppc/board.c |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9c291da339..acc1c519cb 100644
--- a/Makefile
+++ b/Makefile
@@ -187,7 +187,7 @@ endif
 #########################################################################
 
 unconfig:
-	rm -f include/config.h include/config.mk board/*/config.tmp
+	@rm -f include/config.h include/config.mk board/*/config.tmp
 
 #========================================================================
 # PowerPC
@@ -217,13 +217,17 @@ icecube_5200_config		\
 IceCube_5200_config		\
 IceCube_5100_config:		unconfig
 	@ >include/config.h
-	@[ -z "$(findstring LOWBOOT,$@)" ] || \
-		{ echo "TEXT_BASE = 0xFF000000" >board/icecube/config.tmp ; \
+	@[ -z "$(findstring LOWBOOT_,$@)" ] || \
+		{ if [ "$(findstring DDR,$@)" ] ; \
+			then echo "TEXT_BASE = 0xFF800000" >board/icecube/config.tmp ; \
+			else echo "TEXT_BASE = 0xFF000000" >board/icecube/config.tmp ; \
+		  fi ; \
 		  echo "... with LOWBOOT configuration" ; \
 		}
 	@[ -z "$(findstring LOWBOOT08,$@)" ] || \
 		{ echo "TEXT_BASE = 0xFF800000" >board/icecube/config.tmp ; \
 		  echo "... with 8 MB flash only" ; \
+		  echo "... with LOWBOOT configuration" ; \
 		}
 	@[ -z "$(findstring DDR,$@)" ] || \
 		{ echo "#define CONFIG_MPC5200_DDR"	>>include/config.h ; \
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index ae0ecb29eb..de5adb4c3c 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -84,7 +84,9 @@ void nand_init (void);
 
 static char *failed = "*** failed ***\n";
 
+#if defined(CONFIG_OXC) || defined(CONFIG_PCU_E) || defined(CONFIG_RMU)
 extern flash_info_t flash_info[];
+#endif
 
 #include <environment.h>
 
-- 
2.30.2