Update of /cvsroot/linux-vax/kernel-2.4/arch/cris/boot/rescue
In directory sc8-pr-cvs1:/tmp/cvs-serv23180/arch/cris/boot/rescue
Modified Files:
Makefile head.S
Log Message:
DA: sync to Marcelo 2.4.18 + remove init_mmap (no longer needed)
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/cris/boot/rescue/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 10 Apr 2002 14:15:58 -0000 1.1
+++ Makefile 10 Jun 2003 01:45:50 -0000 1.2
@@ -3,6 +3,8 @@
#
ifndef TOPDIR
TOPDIR = ../../../..
+HPATH = $(TOPDIR)/include
+export HPATH
endif
CC = gcc-cris -mlinux -I $(TOPDIR)/include
CFLAGS = -O2
@@ -35,7 +37,7 @@
dd if=kimagerescue_tmp.bin of=kimagerescue.bin bs=1 count=784
rm ktr.bin tmp2423 kimagerescue_tmp.bin
-head.o: head.S
+head.o: head.S
$(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
testrescue.o: testrescue.S
@@ -52,3 +54,8 @@
modules:
modules-install:
+
+depend:
+ $(CC) -M *.S > .depend
+
+-include .depend
Index: head.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/cris/boot/rescue/head.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- head.S 10 Apr 2002 14:15:58 -0000 1.1
+++ head.S 10 Jun 2003 01:45:50 -0000 1.2
@@ -114,7 +114,7 @@
#define NOP_DI 0xf025050f
#define RAM_INIT_MAGIC 0x56902387
-
+
.text
;; This is the entry point of the rescue code
@@ -144,7 +144,13 @@
jumptarget:
.dword 0xffffffff ; can be overwritten later to insert new code
-no_newjump:
+no_newjump:
+#ifdef CONFIG_ETRAX_ETHERNET
+ ;; Start MII clock to make sure it is running when tranceiver is reset
+ move.d 0x3, $r0 ; enable = on, phy = mii_clk
+ move.d $r0, [R_NETWORK_GEN_CONFIG]
+#endif
+
;; We need to setup the bus registers before we start using the DRAM
#include "../../lib/dram_init.S"
|
