From: Wolfgang Denk Date: Tue, 9 Sep 2008 00:24:51 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx X-Git-Tag: v2008.10-rc1~33 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ab00e7a23e088505b22cba7b84145806129b83bf;p=u-boot Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx Conflicts: Makefile Signed-off-by: Wolfgang Denk --- ab00e7a23e088505b22cba7b84145806129b83bf diff --cc Makefile index 91f542e77d,ae3db0a644..a342a88083 --- a/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