patch-2.1.124 linux/arch/ppc/boot/head.S

Next file: linux/arch/ppc/boot/mbxtty.c
Previous file: linux/arch/ppc/boot/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.123/linux/arch/ppc/boot/head.S linux/arch/ppc/boot/head.S
@@ -7,7 +7,7 @@
 	.text
 
 /*
- * $Id: head.S,v 1.24 1998/07/21 02:43:50 cort Exp $
+ * $Id: head.S,v 1.26 1998/09/19 01:21:20 cort Exp $
  *	
  * This code is loaded by the ROM loader at some arbitrary location.
  * Move it to high memory so that it can load the kernel at 0x0000.
@@ -144,6 +144,11 @@
 	mr	r3, r11
         mr      r21, r11
 	bl      serial_init		/* Init MBX serial port */
+
+	lis	r8, 0xfa200000@h	/* Disable Ethernet SCC */
+	li	r0, 0
+	stw	r0, 0x0a00(r8)
+
 	mr      r11, r21
 	lis	r8,start@h
 	ori	r8,r8,start@l
@@ -166,6 +171,7 @@
 	   as ptr to residual -- Cort*/
 	lis	r6,cmd_line@h
 	ori	r6,r6,cmd_line@l
+	lwz	r6, 0(r6)
 	subi	r7,r6,1
 00:	lbzu	r2,1(r7)
 	cmpi	0,r2,0

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov