cmd_nand: show nand scrub confirmation character

[people/ms/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index bd0151f5d09ddfb09dba20e01021dd83d2b01830..398e94de8e7a4ec491f3fba9fa622f2231048b4f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2000-2009
+# (C) Copyright 2000-2010
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -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
@@ -549,8 +548,7 @@ icecube_5200_LOWBOOT_config         \
 icecube_5200_LOWBOOT08_config          \
 icecube_5200_DDR_config                        \
 icecube_5200_DDR_LOWBOOT_config                \
-icecube_5200_DDR_LOWBOOT08_config      \
-icecube_5100_config:                   unconfig
+icecube_5200_DDR_LOWBOOT08_config:     unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/icecube
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
@@ -569,14 +567,6 @@ icecube_5100_config:                       unconfig
                { echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h ; \
                  $(XECHO) "... DDR memory revision" ; \
                }
-       @[ -z "$(findstring 5200,$@)" ] || \
-               { echo "#define CONFIG_MPC5200"         >>$(obj)include/config.h ; \
-                 $(XECHO) "... with MPC5200 processor" ; \
-               }
-       @[ -z "$(findstring 5100,$@)" ] || \
-               { echo "#define CONFIG_MGT5100"         >>$(obj)include/config.h ; \
-                 $(XECHO) "... with MGT5100 processor" ; \
-               }
        @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube
 
 jupiter_config:        unconfig
@@ -595,7 +585,6 @@ lite5200b_LOWBOOT_config:   unconfig
        @mkdir -p $(obj)board/icecube
        @ echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h
        @ $(XECHO) "... DDR memory revision"
-       @ echo "#define CONFIG_MPC5200"         >>$(obj)include/config.h
        @ echo "#define CONFIG_LITE5200B"       >>$(obj)include/config.h
        @[ -z "$(findstring _PM_,$@)" ] || \
                { echo "#define CONFIG_LITE5200B_PM"    >>$(obj)include/config.h ; \
@@ -605,7 +594,6 @@ lite5200b_LOWBOOT_config:   unconfig
                { echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \
                  $(XECHO) "... with LOWBOOT configuration" ; \
                }
-       @ $(XECHO) "... with MPC5200B processor"
        @$(MKCONFIG) -a IceCube  ppc mpc5xxx icecube
 
 mcc200_config  \
@@ -729,21 +717,12 @@ TOP5200_config:   unconfig
        @ echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
        @$(MKCONFIG) -n $@ -a TOP5200 ppc mpc5xxx top5200 emk
 
-Total5100_config               \
 Total5200_config               \
 Total5200_lowboot_config       \
 Total5200_Rev2_config          \
 Total5200_Rev2_lowboot_config: unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/total5200
-       @[ -z "$(findstring 5100,$@)" ] || \
-               { echo "#define CONFIG_MGT5100"         >>$(obj)include/config.h ; \
-                 $(XECHO) "... with MGT5100 processor" ; \
-               }
-       @[ -z "$(findstring 5200,$@)" ] || \
-               { echo "#define CONFIG_MPC5200"         >>$(obj)include/config.h ; \
-                 $(XECHO) "... with MPC5200 processor" ; \
-               }
        @[ -n "$(findstring Rev,$@)" ] || \
                { echo "#define CONFIG_TOTAL5200_REV 1" >>$(obj)include/config.h ; \
                  $(XECHO) "... revision 1 board" ; \
@@ -1741,9 +1720,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 +3036,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