summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-04 01:03:30 +0200
committerWolfgang Denk <wd@denx.de>2008-05-04 01:03:30 +0200
commitfb98f94fcbdf0adef6650f6a95ac6e77b0f6e63e (patch)
treeef2a53892d00ecfd9a09d4597eedea783b291cf4 /cpu
parentbd98ee60df43ee6dd6f5ebe32c67d03e90513ff8 (diff)
parent7c0773fde6100b61be2558cb5d8c442a3194aecb (diff)
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mips/cache.S16
-rw-r--r--cpu/mips/config.mk2
2 files changed, 17 insertions, 1 deletions
diff --git a/cpu/mips/cache.S b/cpu/mips/cache.S
index f5939683208..428d251bf12 100644
--- a/cpu/mips/cache.S
+++ b/cpu/mips/cache.S
@@ -285,6 +285,22 @@ LEAF(dcache_disable)
jr ra
END(dcache_disable)
+/*******************************************************************************
+*
+* dcache_enable - enable cache
+*
+* RETURNS: N/A
+*
+*/
+LEAF(dcache_enable)
+ mfc0 t0, CP0_CONFIG
+ ori t0, CONF_CM_CMASK
+ xori t0, CONF_CM_CMASK
+ ori t0, CONF_CM_CACHABLE_NONCOHERENT
+ mtc0 t0, CP0_CONFIG
+ jr ra
+ END(dcache_enable)
+
#ifdef CFG_INIT_RAM_LOCK_MIPS
/*******************************************************************************
*
diff --git a/cpu/mips/config.mk b/cpu/mips/config.mk
index b505a42550c..a173c5480c0 100644
--- a/cpu/mips/config.mk
+++ b/cpu/mips/config.mk
@@ -20,7 +20,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
-v=$(shell $(AS) --version |grep "GNU assembler" |cut -d. -f2)
+v=$(shell $(AS) --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+' | cut -d. -f2)
MIPSFLAGS:=$(shell \
if [ "$v" -lt "14" ]; then \
echo "-mcpu=4kc"; \