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

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 82cbbf458a99b872ac7cc0ac7589c54d084b3824..4d2d4659e46077e68f911315e43590527ced3b2c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@
 #
 
 VERSION = 2010
-PATCHLEVEL = 03
+PATCHLEVEL = 06
 SUBLEVEL =
-EXTRAVERSION =
+EXTRAVERSION = -rc2
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
@@ -313,7 +313,7 @@ $(obj)u-boot.ldr.srec:      $(obj)u-boot.ldr
                $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary
 
 $(obj)u-boot.img:      $(obj)u-boot.bin
-               ./tools/mkimage -A $(ARCH) -T firmware -C none \
+               $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \
                -a $(TEXT_BASE) -e 0 \
                -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
@@ -2873,6 +2873,10 @@ otc570_config    :       unconfig
 pm9263_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs pm9263 ronetix at91
 
+pm9g45_config  :       unconfig
+       @mkdir -p $(obj)include
+       @$(MKCONFIG) -a pm9g45 arm arm926ejs pm9g45 ronetix at91
+
 SBC35_A9G20_NANDFLASH_config \
 SBC35_A9G20_EEPROM_config \
 SBC35_A9G20_config     :       unconfig
@@ -3155,6 +3159,9 @@ SMN42_config      :       unconfig
 ## ARM CORTEX Systems
 #########################################################################
 
+am3517_evm_config :    unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 am3517evm logicpd omap3
+
 devkit8000_config :    unconfig
        @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 devkit8000 timll omap3
 
@@ -3179,6 +3186,9 @@ omap3_zoom1_config :      unconfig
 omap3_zoom2_config :   unconfig
        @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3
 
+s5p_goni_config:       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 goni samsung s5pc1xx
+
 smdkc100_config:       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx
 
@@ -3324,6 +3334,9 @@ smdk6400_config   :       unconfig
        fi
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
+tnetv107x_evm_config: unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm1176 tnetv107xevm ti tnetv107x
+
 #========================================================================
 # i386
 #========================================================================
@@ -3462,68 +3475,6 @@ purple_config :          unconfig
 #========================================================================
 # Nios
 #========================================================================
-#########################################################################
-## Nios32
-#########################################################################
-
-ADNPESC1_DNPEVA2_base_32_config        \
-ADNPESC1_base_32_config                \
-ADNPESC1_config: unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring _DNPEVA2,$@)" ] || \
-               { echo "#define CONFIG_DNPEVA2 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... DNP/EVA2 configuration" ; \
-               }
-       @[ -z "$(findstring _base_32,$@)" ] || \
-               { echo "#define CONFIG_NIOS_BASE_32 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... NIOS 'base_32' configuration" ; \
-               }
-       @[ -z "$(findstring ADNPESC1_config,$@)" ] || \
-               { echo "#define CONFIG_NIOS_BASE_32 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... NIOS 'base_32' configuration (DEFAULT)" ; \
-               }
-       @$(MKCONFIG) -a ADNPESC1 nios nios adnpesc1 ssv
-
-DK1C20_safe_32_config          \
-DK1C20_standard_32_config      \
-DK1C20_config: unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring _safe_32,$@)" ] || \
-               { echo "#define CONFIG_NIOS_SAFE_32 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... NIOS 'safe_32' configuration" ; \
-               }
-       @[ -z "$(findstring _standard_32,$@)" ] || \
-               { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... NIOS 'standard_32' configuration" ; \
-               }
-       @[ -z "$(findstring DK1C20_config,$@)" ] || \
-               { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... NIOS 'standard_32' configuration (DEFAULT)" ; \
-               }
-       @$(MKCONFIG) -a DK1C20 nios nios dk1c20 altera
-
-DK1S10_safe_32_config          \
-DK1S10_standard_32_config      \
-DK1S10_mtx_ldk_20_config       \
-DK1S10_config: unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring _safe_32,$@)" ] || \
-               { echo "#define CONFIG_NIOS_SAFE_32 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... NIOS 'safe_32' configuration" ; \
-               }
-       @[ -z "$(findstring _standard_32,$@)" ] || \
-               { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... NIOS 'standard_32' configuration" ; \
-               }
-       @[ -z "$(findstring _mtx_ldk_20,$@)" ] || \
-               { echo "#define CONFIG_NIOS_MTX_LDK_20 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... NIOS 'mtx_ldk_20' configuration" ; \
-               }
-       @[ -z "$(findstring DK1S10_config,$@)" ] || \
-               { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... NIOS 'standard_32' configuration (DEFAULT)" ; \
-               }
-       @$(MKCONFIG) -a DK1S10 nios nios dk1s10 altera
 
 #########################################################################
 ## Nios-II