Fix merge problems

[platform/kernel/u-boot.git] / MAKEALL

diff --git a/MAKEALL b/MAKEALL
index e00bb9c..ac4195f 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -48,6 +48,7 @@ LIST_5xxx="           \
        mecp5200        \
        motionpro       \
        munices         \
+       MVBC_P          \
        o2dnt           \
        pf5200          \
        PM520           \
@@ -208,6 +209,8 @@ LIST_4xx="          \
        MIP405T         \
        ML2             \
        ml300           \
+       ml507           \
+       ml507_flash     \
        ocotea          \
        OCRTC           \
        ORSG            \
@@ -221,6 +224,7 @@ LIST_4xx="          \
        PPChameleonEVB  \
        quad100hd       \
        rainier         \
+       redwood         \
        sbc405          \
        sc3             \
        sequoia         \
@@ -461,13 +465,6 @@ LIST_ARM7="                \
 #########################################################################
 
 LIST_ARM9="                    \
-       at91cap9adk             \
-       at91rm9200dk            \
-       at91sam9260ek           \
-       at91sam9261ek           \
-       at91sam9263ek           \
-       at91sam9rlek            \
-       cmc_pu2                 \
        ap920t                  \
        ap922_XA10              \
        ap926ejs                \
@@ -478,11 +475,7 @@ LIST_ARM9="                        \
        cp926ejs                \
        cp946es                 \
        cp966                   \
-       csb637                  \
-       kb9202                  \
        lpd7a400                \
-       m501sk                  \
-       mp2usb                  \
        mx1ads                  \
        mx1fs2                  \
        netstar                 \
@@ -550,7 +543,6 @@ LIST_at91="         \
 #########################################################################
 
 LIST_pxa="             \
-       adsvix          \
        cerf250         \
        cradle          \
        csb226          \
@@ -587,6 +579,7 @@ LIST_arm="          \
        ${LIST_ARM9}    \
        ${LIST_ARM10}   \
        ${LIST_ARM11}   \
+       ${LIST_at91}    \
        ${LIST_pxa}     \
        ${LIST_ixp}     \
 "
@@ -701,7 +694,7 @@ LIST_coldfire="                     \
        M52277EVB               \
        M5235EVB                \
        M5249EVB                \
-       M5253EVB                \
+       M5253EVBE               \
        M5271EVB                \
        M5272C3                 \
        M5275EVB                \