Merge with rsync://git-user@source.denx.net/git/u-boot.git

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

diff --git a/README b/README
index 6327f64..9283c5e 100644 (file)
--- a/README
+++ b/README
@@ -287,17 +287,17 @@ The following options need to be configured:
                CONFIG_EBONY            CONFIG_MOUSSE           CONFIG_SXNI855T
                CONFIG_ELPPC            CONFIG_MPC8260ADS       CONFIG_TQM823L
                CONFIG_ELPT860          CONFIG_MPC8540ADS       CONFIG_TQM8260
-               CONFIG_ep8260           CONFIG_MPC8560ADS       CONFIG_TQM850L
-               CONFIG_ERIC             CONFIG_MUSENKI          CONFIG_TQM855L
-               CONFIG_ESTEEM192E       CONFIG_MVS1             CONFIG_TQM860L
-               CONFIG_ETX094           CONFIG_NETPHONE         CONFIG_TTTech
-               CONFIG_EVB64260         CONFIG_NETTA            CONFIG_UTX8245
-               CONFIG_FADS823          CONFIG_NETVIA           CONFIG_V37
-               CONFIG_FADS850SAR       CONFIG_NX823            CONFIG_W7OLMC
-               CONFIG_FADS860T         CONFIG_OCRTC            CONFIG_W7OLMG
-               CONFIG_FLAGADM          CONFIG_ORSG             CONFIG_WALNUT
-               CONFIG_FPS850L          CONFIG_OXC              CONFIG_ZPC1900
-               CONFIG_FPS860L                                  CONFIG_ZUMA
+               CONFIG_ep8260           CONFIG_MPC8540EVAL      CONFIG_TQM850L
+               CONFIG_ERIC             CONFIG_MPC8560ADS       CONFIG_TQM855L
+               CONFIG_ESTEEM192E       CONFIG_MUSENKI          CONFIG_TQM860L
+               CONFIG_ETX094           CONFIG_MVS1             CONFIG_TTTech
+               CONFIG_EVB64260         CONFIG_NETPHONE         CONFIG_UTX8245
+               CONFIG_FADS823          CONFIG_NETTA            CONFIG_V37
+               CONFIG_FADS850SAR       CONFIG_NETVIA           CONFIG_W7OLMC
+               CONFIG_FADS860T         CONFIG_NX823            CONFIG_W7OLMG
+               CONFIG_FLAGADM          CONFIG_OCRTC            CONFIG_WALNUT
+               CONFIG_FPS850L          CONFIG_ORSG             CONFIG_ZPC1900
+               CONFIG_FPS860L          CONFIG_OXC              CONFIG_ZUMA
 
                ARM based boards:
                -----------------
@@ -2186,14 +2186,14 @@ configurations; the following names are supported:
        DUET_ADS_config         MBX_config              sbc8560_66_config
        EBONY_config            MPC8260ADS_config       SM850_config
        ELPT860_config          MPC8540ADS_config       SPD823TS_config
-       ESTEEM192E_config       MPC8560ADS_config       stxgp3_config
-       ETX094_config           NETVIA_config           SXNI855T_config
-       FADS823_config          omap1510inn_config      TQM823L_config
-       FADS850SAR_config       omap1610h2_config       TQM850L_config
-       FADS860T_config         omap1610inn_config      TQM855L_config
-       FPS850L_config          omap5912osk_config      TQM860L_config
-                               omap2420h4_config       walnut_config
-                                                       Yukon8220_config
+       ESTEEM192E_config       MPC8540EVAL_config      stxgp3_config
+       ETX094_config           MPC8560ADS_config       SXNI855T_config
+       FADS823_config          NETVIA_config           TQM823L_config
+       FADS850SAR_config       omap1510inn_config      TQM850L_config
+       FADS860T_config         omap1610h2_config       TQM855L_config
+       FPS850L_config          omap1610inn_config      TQM860L_config
+                               omap5912osk_config      walnut_config
+                               omap2420h4_config       Yukon8220_config
                                                        ZPC1900_config
 
 Note: for some board special configuration names may exist; check if