diff options
author | Wolfgang Denk <wd@denx.de> | 2010-03-29 10:33:43 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-03-29 10:33:43 (GMT) |
commit | 0020db3f0da61f3e2c8a459a87598e07594dc8ac (patch) | |
tree | 2fe0852444f2412149130186bc740914f4ba794f /Makefile | |
parent | 0d41ad7edcd23b6f23a1cf4e07b2d773493306fd (diff) | |
parent | 2883cc2d48e99fd1873ef8af03fee7966611b735 (diff) | |
download | u-boot-fsl-qoriq-0020db3f0da61f3e2c8a459a87598e07594dc8ac.tar.xz |
Merge remote branch 'origin/master' into next
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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 |