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

Conflicts:

	Makefile

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

diff --combined Makefile
index 91f542e77d7e63755dc65612453a2a9e49232e12,ae3db0a6442947f28cfed11e6b2f4eb9b93e9359..a342a88083da5d0bbe7c5829d46c2f4f617b0ac2
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1242,12 -1242,14 +1242,14 @@@ CMS700_config:       unconfi
  CPCI2DP_config:       unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci2dp esd
  
- CPCI405_config        \
- CPCI4052_config       \
+ CPCI405_config:               unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
+ 
+ CPCI4052_config               \
  CPCI405DT_config      \
  CPCI405AB_config:     unconfig
+       @echo "TEXT_BASE = 0xFFFC0000" > $(obj)board/esd/cpci405/config.tmp
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
-       @echo "BOARD_REVISION = $(@:_config=)"  >> $(obj)include/config.mk
  
  CPCIISER4_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpciiser4 esd
@@@ -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
@@@ -1461,6 -1464,18 +1466,18 @@@ taihu_config: unconfi
  taishan_config:       unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc
  
+ v5fx30teval_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
+       @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" > $(obj)board/avnet/v5fx30teval/config.mk
+       @echo "TEXT_BASE := 0x03000000" >> $(obj)board/avnet/v5fx30teval/config.mk
+       @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet
+ 
+ v5fx30teval_flash_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
+       @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" > $(obj)board/avnet/v5fx30teval/config.mk
+       @echo "TEXT_BASE := 0xFF1C0000" >> $(obj)board/avnet/v5fx30teval/config.mk
+       @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet
+ 
  VOH405_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx voh405 esd
  
@@@ -1479,6 -1494,18 +1496,18 @@@ sycamore_config: unconfi
  WUH405_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx wuh405 esd
  
+ xilinx-ppc440-generic_flash_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic/
+       @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" > $(obj)board/xilinx/ppc440-generic/config.mk
+       @echo "TEXT_BASE := 0xFE360000" >> $(obj)board/xilinx/ppc440-generic/config.mk
+       @$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx
+ 
+ xilinx-ppc440-generic_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic/
+       @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" > $(obj)board/xilinx/ppc440-generic/config.mk
+       @echo "TEXT_BASE := 0x04000000" >> $(obj)board/xilinx/ppc440-generic/config.mk
+       @$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx
+ 
  XPEDITE1K_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx xpedite1k