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 b20ede4..9283c5e 100644 (file)
--- a/README
+++ b/README
@@ -295,7 +295,7 @@ The following options need to be configured:
                CONFIG_FADS823          CONFIG_NETTA            CONFIG_V37
                CONFIG_FADS850SAR       CONFIG_NETVIA           CONFIG_W7OLMC
                CONFIG_FADS860T         CONFIG_NX823            CONFIG_W7OLMG
-               CONFIG_FLAGADM          CONFIG_OCRTC            CONFIG_WALNUT405
+               CONFIG_FLAGADM          CONFIG_OCRTC            CONFIG_WALNUT
                CONFIG_FPS850L          CONFIG_ORSG             CONFIG_ZPC1900
                CONFIG_FPS860L          CONFIG_OXC              CONFIG_ZUMA
 
@@ -2192,7 +2192,7 @@ configurations; the following names are supported:
        FADS850SAR_config       omap1510inn_config      TQM850L_config
        FADS860T_config         omap1610h2_config       TQM855L_config
        FPS850L_config          omap1610inn_config      TQM860L_config
-                               omap5912osk_config      WALNUT405_config
+                               omap5912osk_config      walnut_config
                                omap2420h4_config       Yukon8220_config
                                                        ZPC1900_config
 
@@ -3135,7 +3135,7 @@ locked as (mis-) used as memory, etc.
        CFG_INIT_RAM_ADDR should be somewhere that won't interfere
        with your processor/board/system design. The default value
        you will find in any recent u-boot distribution in
-       Walnut405.h should work for you. I'd set it to a value larger
+       walnut.h should work for you. I'd set it to a value larger
        than your SDRAM module. If you have a 64MB SDRAM module, set
        it above 400_0000. Just make sure your board has no resources
        that are supposed to respond to that address! That code in