diff options
| author | Minkyu Kang <[email protected]> | 2010-03-23 19:09:13 +0900 |
|---|---|---|
| committer | Minkyu Kang <[email protected]> | 2010-03-23 19:09:13 +0900 |
| commit | 45e565337a90bbca0c1bb712b5e008b7c0b18bd5 (patch) | |
| tree | 8bcaee16cda9d8f90f5b596566ad2122c6d8d86b /Makefile | |
| parent | 995a4b1d83a08223c82c1e15778b02e85e5bba51 (diff) | |
| parent | d650da2dd4af99967aabc43cccbd8f160eb4cea6 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
cpu/arm920t/ep93xx/timer.c
Signed-off-by: Minkyu Kang <[email protected]>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -21,10 +21,10 @@ # MA 02111-1307 USA # -VERSION = 2009 -PATCHLEVEL = 11 +VERSION = 2010 +PATCHLEVEL = 03 SUBLEVEL = -EXTRAVERSION = +EXTRAVERSION = -rc1 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 |