summaryrefslogtreecommitdiffstats
path: root/MAKEALL
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-06-11 21:33:16 +0200
committerWolfgang Denk <wd@denx.de>2008-06-11 21:33:16 +0200
commit5ea67393b8b554b8165c38912d753a8df043020d (patch)
tree080077826cffcfebbaa0a950c663e7d165cf6b7d /MAKEALL
parent2395db48869e759c4422efa3d3c25161601aa17b (diff)
parentba04f7010958e88a8910f2a123fee53fdc72e013 (diff)
downloadblackbird-obmc-uboot-5ea67393b8b554b8165c38912d753a8df043020d.tar.gz
blackbird-obmc-uboot-5ea67393b8b554b8165c38912d753a8df043020d.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Conflicts: include/asm-ppc/fsl_lbc.h Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'MAKEALL')
-rwxr-xr-xMAKEALL1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAKEALL b/MAKEALL
index c751586a83..8a0233cca2 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -361,6 +361,7 @@ LIST_85xx=" \
stxssa \
TQM8540 \
TQM8541 \
+ TQM8548 \
TQM8555 \
TQM8560 \
"
OpenPOWER on IntegriCloud