From: Erik M. <er...@us...> - 2001-10-03 17:18:15
|
Update of /cvsroot/blob/blob/src In directory usw-pr-cvs1:/tmp/cvs-serv20214/src Modified Files: start.S linux.c Log Message: Now that the i-cache code is in a separate file, we can get rid of it over here. Index: start.S =================================================================== RCS file: /cvsroot/blob/blob/src/start.S,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- start.S 2001/08/06 22:44:52 1.2 +++ start.S 2001/10/03 17:18:13 1.3 @@ -127,12 +127,6 @@ normal_boot: - /* enable I-cache */ - mrc p15, 0, r1, c1, c0, 0 @ read control reg - orr r1, r1, #0x1000 @ set Icache - mcr p15, 0, r1, c1, c0, 0 @ write it back - - /* check the first 1MB in increments of 4k */ mov r7, #0x1000 mov r6, r7, lsl #8 /* 4k << 2^8 = 1MB */ Index: linux.c =================================================================== RCS file: /cvsroot/blob/blob/src/linux.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux.c 2001/10/02 21:54:48 1.7 +++ linux.c 2001/10/03 17:18:13 1.8 @@ -48,7 +48,7 @@ static struct tag *params; -int boot_linux(int argc, char *argv[]) +static int boot_linux(int argc, char *argv[]) { register u32 i; void (*theKernel)(int zero, int arch) = (void (*)(int, int))KERNEL_RAM_BASE; @@ -66,14 +66,7 @@ /* disable subsystems that want to be disabled before kernel boot */ exit_subsystems(); - /* turn off I-cache */ - asm ("mrc p15, 0, %0, c1, c0, 0": "=r" (i)); - i &= ~0x1000; - asm ("mcr p15, 0, %0, c1, c0, 0": : "r" (i)); - - /* flush I-cache */ - asm ("mcr p15, 0, %0, c7, c5, 0": : "r" (i)); - + /* start kernel */ theKernel(0, ARCH_NUMBER); SerialOutputString("Hey, the kernel returned! This should not happen.\n"); |