Merge with /home/stefan/git/u-boot/denx-merge-sr

diff --cc MAKEALL
index f727c6906d0c51da424b8389b9203c8125a70416,7ccaf918c0e57b22e6e36738dc911a321d7702aa..b3e16bc6c5bced62a61efe127c9d30e2ce2daffc
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -85,10 -85,10 +85,11 @@@ LIST_4xx=" 
        MIP405          MIP405T         ML2             ml300           \
        ocotea          OCRTC           ORSG            p3p440          \
        PCI405          pcs440ep        PIP405          PLU405          \
-       PMC405          PPChameleonEVB  sbc405          sequoia         \
-       sequoia_nand    taishan         VOH405          VOM405          \
-       W7OLMC          W7OLMG          walnut          WUH405          \
-       XPEDITE1K       yellowstone     yosemite        yucca           \
+       PMC405          PPChameleonEVB  sbc405          sc3             \
 -      sequoia         sequoia_nand    VOH405          VOM405          \
 -      W7OLMC          W7OLMG          walnut          WUH405          \
 -      XPEDITE1K       yellowstone     yosemite        yucca           \
++      sequoia         sequoia_nand    taishan         VOH405          \
++      VOM405          W7OLMC          W7OLMG          walnut          \
++      WUH405          XPEDITE1K       yellowstone     yosemite        \
++      yucca                                                           \
  "
  
  #########################################################################

diff --cc Makefile
Simple merge