diff options
| author | wdenk <wdenk> | 2004-04-10 20:43:50 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-04-10 20:43:50 +0000 |
| commit | 17d704eb9544a35dedd2cd8b744f7a8c0b381b1b (patch) | |
| tree | 777c7acf5b52400f624acf7fcc6f92bd3b2f2108 | |
| parent | 7e780369e43ebf5c9e337dfad84dd36b2a08a21f (diff) | |
| download | u-boot-imx-17d704eb9544a35dedd2cd8b744f7a8c0b381b1b.zip u-boot-imx-17d704eb9544a35dedd2cd8b744f7a8c0b381b1b.tar.gz u-boot-imx-17d704eb9544a35dedd2cd8b744f7a8c0b381b1b.tar.bz2 | |
Cleanup for release 1.1.0
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | lib_ppc/board.c | 2 |
2 files changed, 9 insertions, 3 deletions
@@ -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 ae0ecb2..de5adb4 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> |