summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-03-29 12:33:43 +0200
committerWolfgang Denk <wd@denx.de>2010-03-29 12:33:43 +0200
commit0020db3f0da61f3e2c8a459a87598e07594dc8ac (patch)
tree2fe0852444f2412149130186bc740914f4ba794f /Makefile
parent0d41ad7edcd23b6f23a1cf4e07b2d773493306fd (diff)
parent2883cc2d48e99fd1873ef8af03fee7966611b735 (diff)
Merge remote branch 'origin/master' into next
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 804430234c7..c0e73de0eae 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
VERSION = 2010
PATCHLEVEL = 03
SUBLEVEL =
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc3
ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else
@@ -1415,9 +1415,6 @@ MIP405T_config: unconfig
ML2_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc ppc4xx ml2
-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