]> git.proxmox.com Git - mirror_qemu.git/blob - pc-bios/proll.patch
sparc merge (Blue Swirl)
[mirror_qemu.git] / pc-bios / proll.patch
1 diff -ru proll_18.orig/mrcoffee/main.c proll_18/mrcoffee/main.c
2 --- proll_18.orig/mrcoffee/main.c 2002-09-13 16:16:59.000000000 +0200
3 +++ proll_18/mrcoffee/main.c 2004-09-26 11:52:23.000000000 +0200
4 @@ -101,6 +101,7 @@
5 le_probe();
6 init_net();
7
8 +#ifdef ORIG
9 #if 0 /* RARP */
10 if (rarp() != 0) fatal();
11 /* printrarp(); */
12 @@ -117,13 +118,20 @@
13 xtoa(myipaddr, fname, 8);
14 if (load(boot_rec.bp_siaddr, fname) != 0) fatal();
15 #endif
16 +#endif
17
18 romvec = init_openprom(bb.nbanks, bb.bankv, hiphybas);
19
20 printk("Memory used: virt 0x%x:0x%x[%dK] iomap 0x%x:0x%x\n",
21 PROLBASE, (int)cmem.curp, ((unsigned) cmem.curp - PROLBASE)/1024,
22 (int)cio.start, (int)cio.curp);
23 +#ifdef ORIG
24 set_timeout(5); while (!chk_timeout()) { } /* P3: let me read */
25 +#else
26 + printk("loading kernel:");
27 + i = ld_bypass(0x20000000);
28 + printk(" done, size %d\n", i);
29 +#endif
30
31 {
32 void (*entry)(void *, int) = (void (*)(void*, int)) LOADBASE;
33 diff -ru proll_18.orig/mrcoffee/openprom.c proll_18/mrcoffee/openprom.c
34 --- proll_18.orig/mrcoffee/openprom.c 2002-09-13 16:17:03.000000000 +0200
35 +++ proll_18/mrcoffee/openprom.c 2004-09-21 21:27:16.000000000 +0200
36 @@ -144,10 +144,14 @@
37 };
38
39 static int cpu_nctx = NCTX_SWIFT;
40 +static int cpu_cache_line_size = 0x20;
41 +static int cpu_cache_nlines = 0x200;
42 static struct property propv_cpu[] = {
43 {"name", "STP1012PGA", sizeof("STP1012PGA") },
44 {"device_type", "cpu", 4 },
45 {"mmu-nctx", (char*)&cpu_nctx, sizeof(int)},
46 + {"cache-line-size", (char*)&cpu_cache_line_size, sizeof(int)},
47 + {"cache-nlines", (char*)&cpu_cache_nlines, sizeof(int)},
48 {NULL, NULL, -1}
49 };
50