Cleanup for release 1.1.0

diff --git a/Makefile b/Makefile
index 9c291da339646e645eadbd991015e6ab0d2e3ba6..acc1c519cbab4452950b790a0fac0a73914e9201 100644 (file)
--- 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 ae0ecb29ebf1f54b91f35ea6bcf79f3b2e002633..de5adb4c3c9f415343392dc51ece137595234a02 100644 (file)
--- 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>