diff options
author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-08 15:10:33 +0100 |
---|---|---|
committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-08 15:10:33 +0100 |
commit | 9b223555aa390e9a33ee8d4bbd2865fd1fbae9f7 (patch) | |
tree | c9ef5f250ec76cda491b1dd6704d317448df3958 /Makefile | |
parent | ecde8243a8351725ff598f42c88ded154f8a0f1e (diff) | |
parent | 0fc52948bda0734431cb528ee4fd82f1dec8c7b5 (diff) |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'Makefile')
-rwxr-xr-x | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -24,7 +24,7 @@ VERSION = 2009 PATCHLEVEL = 11 SUBLEVEL = -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else @@ -3275,6 +3275,7 @@ zylonite_config : ######################################################################### apollon_config : unconfig + @mkdir -p $(obj)include @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h @$(MKCONFIG) $(@:_config=) arm arm1136 apollon NULL omap24xx @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk |