Fix MACH_TYPE for the AT91RM9200DK board.

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index ae3db0a6442947f28cfed11e6b2f4eb9b93e9359..e8bbd7808e33d30dee50005363aea6eb0f05f370 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,15 @@
 # MA 02111-1307 USA
 #
 
-VERSION = 1
-PATCHLEVEL = 3
-SUBLEVEL = 4
-EXTRAVERSION =
+VERSION = 2008
+PATCHLEVEL = 10
+SUBLEVEL =
+EXTRAVERSION = -rc1
+ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
+else
+U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL)$(EXTRAVERSION)
+endif
 VERSION_FILE = $(obj)include/version_autogenerated.h
 
 HOSTARCH := $(shell uname -m | \
@@ -295,7 +299,7 @@ $(obj)u-boot.hex:   $(obj)u-boot
                $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@
 
 $(obj)u-boot.srec:     $(obj)u-boot
-               $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@
+               $(OBJCOPY) -O srec $< $@
 
 $(obj)u-boot.bin:      $(obj)u-boot
                $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
@@ -1248,6 +1252,7 @@ CPCI405_config:           unconfig
 CPCI4052_config                \
 CPCI405DT_config       \
 CPCI405AB_config:      unconfig
+       @mkdir -p $(obj)board/esd/cpci405
        @echo "TEXT_BASE = 0xFFFC0000" > $(obj)board/esd/cpci405/config.tmp
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
 
@@ -1359,15 +1364,21 @@ ml300_config:   unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx
 
 ml507_flash_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
-       @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
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
+               > $(obj)board/xilinx/ml507/config.tmp
+       @echo "TEXT_BASE := 0xFE360000" \
+               >> $(obj)board/xilinx/ml507/config.tmp
        @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx
 
 ml507_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
-       @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
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
+               > $(obj)board/xilinx/ml507/config.tmp
+       @echo "TEXT_BASE := 0x04000000"  \
+               >> $(obj)board/xilinx/ml507/config.tmp
        @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx
 
 ocotea_config: unconfig
@@ -1465,15 +1476,21 @@ taishan_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc
 
 v5fx30teval_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
        @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
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
+               > $(obj)board/avnet/v5fx30teval/config.tmp
+       @echo "TEXT_BASE := 0x03000000" \
+               >> $(obj)board/avnet/v5fx30teval/config.tmp
        @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet
 
 v5fx30teval_flash_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
        @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
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
+               > $(obj)/board/avnet/v5fx30teval/config.tmp
+       @echo "TEXT_BASE := 0xFF1C0000" \
+               >> $(obj)/board/avnet/v5fx30teval/config.tmp
        @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet
 
 VOH405_config: unconfig
@@ -1495,15 +1512,19 @@ 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
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
+               > $(obj)board/xilinx/ppc440-generic/config.tmp
+       @echo "TEXT_BASE := 0xFE360000" \
+               >> $(obj)board/xilinx/ppc440-generic/config.tmp
        @$(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
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
+               > $(obj)board/xilinx/ppc440-generic/config.tmp
+       @echo "TEXT_BASE := 0x04000000" \
+               >> $(obj)board/xilinx/ppc440-generic/config.tmp
        @$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx
 
 XPEDITE1K_config:      unconfig