Cleanup for release 1.1.0

wdenk
1 parent 7e780369e4
Showing 2 changed files with 9 additions and 3 deletions Side-by-side Diff
Makefile
lib_ppc/board.c
@@ -187,7 +187,7 @@
 #########################################################################
  
 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_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 ; \
@@ -84,7 +84,9 @@
  
 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>
...	...	@@ -187,7 +187,7 @@
187	187	#########################################################################
188	188
189	189	unconfig:
190		- rm -f include/config.h include/config.mk board/*/config.tmp
	190	+ @rm -f include/config.h include/config.mk board/*/config.tmp
191	191
192	192	#========================================================================
193	193	# PowerPC
194	194
...	...	@@ -217,13 +217,17 @@
217	217	IceCube_5200_config \
218	218	IceCube_5100_config: unconfig
219	219	@ >include/config.h
220		- @[ -z "$(findstring LOWBOOT,$@)" ] \|\| \
221		- { echo "TEXT_BASE = 0xFF000000" >board/icecube/config.tmp ; \
	220	+ @[ -z "$(findstring LOWBOOT_,$@)" ] \|\| \
	221	+ { if [ "$(findstring DDR,$@)" ] ; \
	222	+ then echo "TEXT_BASE = 0xFF800000" >board/icecube/config.tmp ; \
	223	+ else echo "TEXT_BASE = 0xFF000000" >board/icecube/config.tmp ; \
	224	+ fi ; \
222	225	echo "... with LOWBOOT configuration" ; \
223	226	}
224	227	@[ -z "$(findstring LOWBOOT08,$@)" ] \|\| \
225	228	{ echo "TEXT_BASE = 0xFF800000" >board/icecube/config.tmp ; \
226	229	echo "... with 8 MB flash only" ; \
	230	+ echo "... with LOWBOOT configuration" ; \
227	231	}
228	232	@[ -z "$(findstring DDR,$@)" ] \|\| \
229	233	{ echo "#define CONFIG_MPC5200_DDR" >>include/config.h ; \
...	...	@@ -84,7 +84,9 @@
84	84
85	85	static char failed = " failed *\n";
86	86
	87	+#if defined(CONFIG_OXC) \|\| defined(CONFIG_PCU_E) \|\| defined(CONFIG_RMU)
87	88	extern flash_info_t flash_info[];
	89	+#endif
88	90
89	91	#include <environment.h>
90	92