Merge with /home/tur/git/u-boot#motionpro
authorWolfgang Denk <wd@pollux.denx.de>
Fri, 16 Feb 2007 22:44:55 +0000 (23:44 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 16 Feb 2007 22:44:55 +0000 (23:44 +0100)
1  2 
MAKEALL
Makefile

diff --cc MAKEALL
+++ b/MAKEALL
@@@ -37,9 -37,9 +37,10 @@@ LIST_5xx="   
  LIST_5xxx="   \
        BC3450          cpci5200        EVAL5200        fo300           \
        icecube_5100    icecube_5200    lite5200b       mcc200          \
-       mecp5200        o2dnt           pf5200          PM520           \
 -      motionpro       o2dnt           pf5200          PM520           \
--      TB5200          Total5100       Total5200       Total5200_Rev2  \
--      TQM5200         TQM5200_B       TQM5200S        v38b            \
++      mecp5200        motionpro       o2dnt           pf5200          \
++      PM520           TB5200          Total5100       Total5200       \
++      Total5200_Rev2  TQM5200         TQM5200_B       TQM5200S        \
++      v38b                                                            \
  "
  
  #########################################################################
diff --cc Makefile
Simple merge