projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7e78036
)
Cleanup for release 1.1.0
author
wdenk
<wdenk>
Sat, 10 Apr 2004 20:43:50 +0000
(20:43 +0000)
committer
wdenk
<wdenk>
Sat, 10 Apr 2004 20:43:50 +0000
(20:43 +0000)
Makefile
patch
|
blob
|
history
lib_ppc/board.c
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
9c291da
..
acc1c51
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-187,7
+187,7
@@
endif
#########################################################################
unconfig:
#########################################################################
unconfig:
- rm -f include/config.h include/config.mk board/*/config.tmp
+
@
rm -f include/config.h include/config.mk board/*/config.tmp
#========================================================================
# PowerPC
#========================================================================
# PowerPC
@@
-217,13
+217,17
@@
icecube_5200_config \
IceCube_5200_config \
IceCube_5100_config: unconfig
@ >include/config.h
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 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 ; \
}
@[ -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
(file)
--- a/
lib_ppc/board.c
+++ b/
lib_ppc/board.c
@@
-84,7
+84,9
@@
void nand_init (void);
static char *failed = "*** failed ***\n";
static char *failed = "*** failed ***\n";
+#if defined(CONFIG_OXC) || defined(CONFIG_PCU_E) || defined(CONFIG_RMU)
extern flash_info_t flash_info[];
extern flash_info_t flash_info[];
+#endif
#include <environment.h>
#include <environment.h>