summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-04 00:02:29 +0200
committerWolfgang Denk <wd@denx.de>2008-05-04 00:02:29 +0200
commit4a89b766bf7798e1f4fc4ffabb68172cf88c65f0 (patch)
tree8f043e179cbdedc77b4cc9ad9e5e283d3cae907d
parent6fdd002689190a0022c7b3dbab37fcba724580ce (diff)
parent141ba1cad8e6598a2466e7e2976c6a12285df619 (diff)
downloadu-boot-imx-4a89b766bf7798e1f4fc4ffabb68172cf88c65f0.zip
u-boot-imx-4a89b766bf7798e1f4fc4ffabb68172cf88c65f0.tar.gz
u-boot-imx-4a89b766bf7798e1f4fc4ffabb68172cf88c65f0.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-mips
-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 f593968..428d251 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 b505a42..a173c54 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"; \