MIPS updates

Dear Wolfgang,

please pull MIPS updates. 2 patches are there. One fixes a build failure caused by absence of dcache_enable(). The other is for a better handling of gas minor version (this isn't a kind of bug fix, but I'd like to push this for 1.3.3 release. Ok?).

Each patch has not been posted to u-boot-users yet, so they will follow this mail. Please review (and apply).

thanks,

Shinya

---
The following changes since commit 50f93d30dae3c5d888aa244d964ccd77be9b1c0c:
Wolfgang Denk (1):

        Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

are available in the git repository at:

git://git.denx.de/u-boot-mips.git master

Shinya Kuribayashi (2):
[MIPS] cpu/mips/cache.S: Add dcache_enable
[MIPS] cpu/mips/config.mk: Fix GNU assembler minor version picker

 cpu/mips/cache.S   |   16 ++++++++++++++++
 cpu/mips/config.mk |    2 +-
 2 files changed, 17 insertions(+), 1 deletions(-)

Recent bootelf command fixes (017e9b7925f74878d0e9475388cca9bda5ef9482, "allow ports to override bootelf behavior") requires ports to have this function.

---

 cpu/mips/cache.S |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

index f593968..428d251 100644
@@ -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
 /*******************************************************************************
 *

Current trick to pick up GNU assembler minor version uses a dot(.) as a delimiter, and take the second field to obtain minor version number. But as can be expected, this doesn't work with a version string which has dots more than needs.

Here's an example:

$ mips-linux-gnu-as --version | grep 'GNU assembler'
GNU assembler (Sourcery G++ Lite 4.2-129) 2.18.50.20080215
$ mips-linux-gnu-as --version | grep 'GNU assembler' | cut -d. -f2
2-129) 2
$

This patch restricts the version format to 2.XX.XX... This will work in most cases.

$ mips-linux-gnu-as --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+'
2.18.50.20080215
$ mips-linux-gnu-as --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+' | cut -d. -f2
18
$

---

 cpu/mips/config.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index b505a42..a173c54 100644
@@ -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"; \

Applied, thanks.

Best regards,

Wolfgang Denk

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If a man had a child who'd gone  anti-social,  killed  perhaps,  he'd
still tend to protect that child.
	-- McCoy, "The Ultimate Computer", stardate 4731.3