diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2007-01-22 13:15:35 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-01-22 13:15:35 +0800 |
| commit | ee460917afb74767aedc3da095d4fec4a50ba6f8 (patch) | |
| tree | fdead38c4681fc9adbedd6836792660f933614d3 /MAKEALL | |
| parent | a41969e09b9d886091a804c2ba5f1ab84b084dd3 (diff) | |
| parent | a4012396645533aef218354eeba754dff0deace8 (diff) | |
| download | u-boot-ee460917afb74767aedc3da095d4fec4a50ba6f8.tar.gz u-boot-ee460917afb74767aedc3da095d4fec4a50ba6f8.tar.xz u-boot-ee460917afb74767aedc3da095d4fec4a50ba6f8.zip | |
Merge branch 'master' into hpc2
Conflicts:
drivers/cfi_flash.c
The patch by Heiko Schocher <hs@pollux.denx.de> on Jan, 19, 2007
fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support
mpc7448hpc2 board.
Diffstat (limited to 'MAKEALL')
| -rwxr-xr-x | MAKEALL | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -85,10 +85,11 @@ LIST_4xx=" \ MIP405 MIP405T ML2 ml300 \ ocotea OCRTC ORSG p3p440 \ PCI405 pcs440ep PIP405 PLU405 \ - PMC405 PPChameleonEVB sbc405 sequoia \ - sequoia_nand VOH405 VOM405 W7OLMC \ - W7OLMG walnut WUH405 XPEDITE1K \ - yellowstone yosemite yucca \ + PMC405 PPChameleonEVB sbc405 sc3 \ + sequoia sequoia_nand taishan VOH405 \ + VOM405 W7OLMC W7OLMG walnut \ + WUH405 XPEDITE1K yellowstone yosemite \ + yucca \ " ######################################################################### @@ -225,7 +226,7 @@ LIST_pxa=" \ xsengine zylonite \ " -LIST_ixp="ixdp425 ixdpg425 pdnb3" +LIST_ixp="ixdp425 ixdpg425 pdnb3 scpu" LIST_arm=" \ |