Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire

Makefile

@@ -1925,7 +1925,7 @@ M5485HFE_config :	unconfig
 	M5485EFE_config)	BOOT=2;CODE=0;VID=1;USB=1;RAM=64;RAM1=0;; \
 	M5485FFE_config)	BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \
 	M5485GFE_config)	BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
-	M5485HFE_config)	BOOT=2;CODE=;VID=1;USB=0;RAM=64;RAM1=0;; \
+	M5485HFE_config)	BOOT=2;CODE=16;VID=1;USB=0;RAM=64;RAM1=0;; \
 	esac; \
 	>include/config.h ; \
 	echo "#define CFG_BUSCLK	100000000" > $(obj)include/config.h ; \

cpu/mcf52x2/interrupts.c

@@ -77,7 +77,7 @@ void dtimer_intr_setup(void)
 	volatile int0_t *intp = (int0_t *) (CFG_INTR_BASE);
 
 	intp->icr0[CFG_TMRINTR_NO] = CFG_TMRINTR_PRI;
-	intp->imrl0 &= ~0xFFFFFFFE;
+	intp->imrl0 &= 0xFFFFFFFE;
 	intp->imrl0 &= ~CFG_TMRINTR_MASK;
 }
 #endif				/* CONFIG_MCFTMR */