diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2007-02-28 16:46:48 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-02-28 16:46:48 +0800 |
| commit | 00b574bdc8c54dbc9e03f63c24f62955d483e3ef (patch) | |
| tree | dc49c4219bafd43c2ace6c5a3e6745d7b7264194 /MAKEALL | |
| parent | 30bddf2c46ab2e824f217a38db033118ac4622af (diff) | |
| parent | ccbc7036648e465697ca298ba51e0e76dda352a0 (diff) | |
| download | u-boot-00b574bdc8c54dbc9e03f63c24f62955d483e3ef.tar.gz u-boot-00b574bdc8c54dbc9e03f63c24f62955d483e3ef.tar.bz2 u-boot-00b574bdc8c54dbc9e03f63c24f62955d483e3ef.zip | |
Merge branch 'master' into hpc2
Conflicts:
drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Diffstat (limited to 'MAKEALL')
| -rwxr-xr-x | MAKEALL | 25 |
1 files changed, 13 insertions, 12 deletions
@@ -37,9 +37,10 @@ LIST_5xx=" \ LIST_5xxx=" \ BC3450 cpci5200 EVAL5200 fo300 \ icecube_5100 icecube_5200 lite5200b mcc200 \ - mecp5200 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 \ " ######################################################################### @@ -81,15 +82,15 @@ LIST_4xx=" \ CRAYL1 csb272 csb472 DASA_SIM \ DP405 DU405 ebony ERIC \ EXBITGEN G2000 HH405 HUB405 \ - JSE KAREF luan METROBOX \ - MIP405 MIP405T ML2 ml300 \ - ocotea OCRTC ORSG p3p440 \ - PCI405 pcs440ep PIP405 PLU405 \ - PMC405 PPChameleonEVB sbc405 sc3 \ - sequoia sequoia_nand taishan VOH405 \ - VOM405 W7OLMC W7OLMG walnut \ - WUH405 XPEDITE1K yellowstone yosemite \ - yucca \ + JSE KAREF katmai luan \ + METROBOX MIP405 MIP405T ML2 \ + ml300 ocotea OCRTC ORSG \ + p3p440 PCI405 pcs440ep PIP405 \ + PLU405 PMC405 PPChameleonEVB sbc405 \ + sc3 sequoia sequoia_nand taishan \ + VOH405 VOM405 W7OLMC W7OLMG \ + walnut WUH405 XPEDITE1K yellowstone \ + yosemite yucca \ " ######################################################################### |