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

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index ca399db0f3b86c4c518e7792fd3f4b8283ac65ef..c37f8682a86904a91c59704a55e05fd4c40d9f52 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,10 @@
 # MA 02111-1307 USA
 #
 
-VERSION = 2009
-PATCHLEVEL = 11
+VERSION = 2010
+PATCHLEVEL = 03
 SUBLEVEL =
-EXTRAVERSION =
+EXTRAVERSION = -rc2
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
@@ -218,7 +218,6 @@ LIBS += drivers/mtd/ubi/libubi.a
 LIBS += drivers/mtd/spi/libspi_flash.a
 LIBS += drivers/net/libnet.a
 LIBS += drivers/net/phy/libphy.a
-LIBS += drivers/net/sk98lin/libsk98lin.a
 LIBS += drivers/pci/libpci.a
 LIBS += drivers/pcmcia/libpcmcia.a
 LIBS += drivers/power/libpower.a
@@ -1741,9 +1740,6 @@ Sandpoint8245_config: unconfig
 sbc8240_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc824x sbc8240
 
-SL8245_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x sl8245
-
 utx8245_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc824x utx8245
 
@@ -3060,6 +3056,9 @@ spear320_config : unconfig
 spear600_config :      unconfig
        @$(MKCONFIG) -n $@ -t $(@:_config=) spear6xx arm arm926ejs $(@:_config=) spear spear
 
+suen3_config:  unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs km_arm keymile kirkwood
+
 SX1_stdout_serial_config \
 SX1_config:            unconfig
        @mkdir -p $(obj)include
@@ -3100,6 +3099,10 @@ trab_old_config: unconfig
                }
        @$(MKCONFIG) -a $(call xtract_trab,$@) arm arm920t trab NULL s3c24x0
 
+tx25_config    : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs tx25 karo mx25
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
+
 VCMA9_config   :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t vcma9 mpl s3c24x0