summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-02-22 12:56:11 +0100
committerWolfgang Denk <wd@denx.de>2008-02-22 12:56:11 +0100
commit55c802ebb1f2c9f475569b2c3e9be125098d4174 (patch)
treec0118ef9231d8939490d1738c99b70df68bd6ca5
parent5a9abcc317cf3c8a69559ff83081f4e5d719edb7 (diff)
parent4d264eff4312f230776b913edade7ceb75f1b1e0 (diff)
downloadu-boot-imx-55c802ebb1f2c9f475569b2c3e9be125098d4174.zip
u-boot-imx-55c802ebb1f2c9f475569b2c3e9be125098d4174.tar.gz
u-boot-imx-55c802ebb1f2c9f475569b2c3e9be125098d4174.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
-rw-r--r--Makefile2
-rw-r--r--cpu/mcf52x2/interrupts.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7d35d14..2790865 100644
--- a/Makefile
+++ b/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 ; \
diff --git a/cpu/mcf52x2/interrupts.c b/cpu/mcf52x2/interrupts.c
index 2ccbde5..9167cec 100644
--- a/cpu/mcf52x2/interrupts.c
+++ b/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 */