Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

Conflicts:

	Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --cc Makefile
index 91f542e,ae3db0a..a342a88
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1356,16 -1358,17 +1358,19 @@@ ML2_config:  unconfi
  ml300_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx
  
- ml507_flash_config:   unconfig
+ ml507_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
-       @cp board/xilinx/ml507/u-boot-rom.lds  $(obj)board/xilinx/ml507/u-boot.lds
-       @echo "TEXT_BASE = 0xFE360000" > $(obj)board/xilinx/ml507/config.tmp
-       @$(MKCONFIG) $(@:_flash_config=) ppc ppc4xx ml507 xilinx
 -      @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" > $(obj)board/xilinx/ml507/config.mk
++      @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" \
++              > $(obj)board/xilinx/ml507/config.mk
+       @echo "TEXT_BASE := 0xFE360000" >> $(obj)board/xilinx/ml507/config.mk
+       @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx
  
- ml507_config: unconfig
+ ml507_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
-       @cp board/xilinx/ml507/u-boot-ram.lds  $(obj)board/xilinx/ml507/u-boot.lds
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml507 xilinx
 -      @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" > $(obj)board/xilinx/ml507/config.mk
++      @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" \
++              > $(obj)board/xilinx/ml507/config.mk
+       @echo "TEXT_BASE := 0x04000000" >> $(obj)board/xilinx/ml507/config.mk
+       @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx
  
  ocotea_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx ocotea amcc