summaryrefslogtreecommitdiff
path: root/MAKEALL
diff options
context:
space:
mode:
authorroy zang <tie-fei.zang@freescale.com>2006-12-01 12:09:33 +0800
committerZang Tiefei <roy@bus.ap.freescale.net>2006-12-01 12:09:33 +0800
commite0b369e4f71b11dd5716903dd6258028cf07e6e8 (patch)
tree615986f2b3088072c49d74e1086650e185087698 /MAKEALL
parentee311214e0d216f904feea269599d0934bf71f23 (diff)
parentdd520bf314c7add4183c5191692180f576f96b60 (diff)
downloadu-boot-imx-e0b369e4f71b11dd5716903dd6258028cf07e6e8.zip
u-boot-imx-e0b369e4f71b11dd5716903dd6258028cf07e6e8.tar.gz
u-boot-imx-e0b369e4f71b11dd5716903dd6258028cf07e6e8.tar.bz2
Fix the confilcts when merging 'master' into hpc2.
The conflicts due to a new mpc7448 p3m7448 board is in the main tree. Merge branch 'master' into hpc2 Conflicts: MAKEALL cpu/74xx_7xx/cpu.c cpu/74xx_7xx/cpu_init.c cpu/74xx_7xx/speed.c
Diffstat (limited to 'MAKEALL')
-rwxr-xr-xMAKEALL10
1 files changed, 6 insertions, 4 deletions
diff --git a/MAKEALL b/MAKEALL
index 5aad6e7..fd78585 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -130,7 +130,7 @@ LIST_8260=" \
#########################################################################
LIST_83xx=" \
- TQM834x MPC8349EMDS \
+ TQM834x MPC8349EMDS MPC8349ITX MPC8360EMDS \
"
@@ -150,12 +150,14 @@ LIST_85xx=" \
#########################################################################
LIST_74xx=" \
- DB64360 DB64460 EVB64260 mpc7448hpc2 \
- P3G4 PCIPPC2 PCIPPC6 ZUMA \
+ DB64360 DB64460 EVB64260 P3G4 \
+ p3m7448 PCIPPC2 PCIPPC6 ZUMA \
+ mpc7448hpc2
"
LIST_7xx=" \
- BAB7xx CPCI750 ELPPC ppmc7xx \
+ BAB7xx CPCI750 ELPPC p3m750 \
+ ppmc7xx \
"
LIST_ppc="${LIST_5xx} ${LIST_5xxx} \