diff --git a/CHANGELOG b/CHANGELOG index 78fdfed37b..7d60bd9e42 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,10 @@ CHANGELOG ========= - devel - v2.1 +2014-11-04 - v2.1 * Add configurable boot-stop string support * Add configurable baudrate support + * Fix memory init bug 2014-10-21 - v2.0 - * Initial USB support \ No newline at end of file + * Initial USB support diff --git a/Makefile b/Makefile index 46907e307f..449c245c75 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ export FLASH_SIZE=16 export NEW_DDR_TAP_CAL=1 export CONFIG_HORNET_XTAL=40 export CONFIG_HORNET_1_1_WAR=1 -export CARABOOT_RELEASE=v2.1-dev +export CARABOOT_RELEASE=v2.1 IMAGEPATH=$(BUILD_TOPDIR)/bin UBOOT_BINARY=u-boot.bin @@ -42,4 +42,4 @@ all: @echo Done clean: - cd $(UBOOTDIR) && $(MAKECMD) distclean \ No newline at end of file + cd $(UBOOTDIR) && $(MAKECMD) distclean