diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2004-10-04 21:23:09 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2004-10-04 21:23:09 +0000 |
| commit | 8d5f07fa3bd3433e779d13eb1cda4fbb07acb67f (patch) | |
| tree | 05ba111ca75cbc1f5080dd4745659cb11cb7d5a5 /pc-bios | |
| parent | 023fcb9507b0d98d8dc98ffaa407e66d84bb6ea4 (diff) | |
sparc merge (Blue Swirl)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1098 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/README | 5 | ||||
| -rw-r--r-- | pc-bios/proll.bin | bin | 0 -> 56856 bytes | |||
| -rw-r--r-- | pc-bios/proll.patch | 50 |
3 files changed, 55 insertions, 0 deletions
diff --git a/pc-bios/README b/pc-bios/README index 31f91f3cef..a10a9f0dfa 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -6,3 +6,8 @@ - The PowerPC Open Hack'Ware Open Firmware Compatible BIOS is available at http://site.voila.fr/jmayer/OpenHackWare/index.htm. + +- Proll is a GPL'd boot PROM for Sparc JavaStations + (http://people.redhat.com/zaitcev/linux/). + Applying proll.patch allows circumventing some bugs and enables + faster kernel load through a hack. diff --git a/pc-bios/proll.bin b/pc-bios/proll.bin Binary files differnew file mode 100644 index 0000000000..0489cc245f --- /dev/null +++ b/pc-bios/proll.bin diff --git a/pc-bios/proll.patch b/pc-bios/proll.patch new file mode 100644 index 0000000000..b0860e26f4 --- /dev/null +++ b/pc-bios/proll.patch @@ -0,0 +1,50 @@ +diff -ru proll_18.orig/mrcoffee/main.c proll_18/mrcoffee/main.c +--- proll_18.orig/mrcoffee/main.c 2002-09-13 16:16:59.000000000 +0200 ++++ proll_18/mrcoffee/main.c 2004-09-26 11:52:23.000000000 +0200 +@@ -101,6 +101,7 @@ + le_probe(); + init_net(); + ++#ifdef ORIG + #if 0 /* RARP */ + if (rarp() != 0) fatal(); + /* printrarp(); */ +@@ -117,13 +118,20 @@ + xtoa(myipaddr, fname, 8); + if (load(boot_rec.bp_siaddr, fname) != 0) fatal(); + #endif ++#endif + + romvec = init_openprom(bb.nbanks, bb.bankv, hiphybas); + + printk("Memory used: virt 0x%x:0x%x[%dK] iomap 0x%x:0x%x\n", + PROLBASE, (int)cmem.curp, ((unsigned) cmem.curp - PROLBASE)/1024, + (int)cio.start, (int)cio.curp); ++#ifdef ORIG + set_timeout(5); while (!chk_timeout()) { } /* P3: let me read */ ++#else ++ printk("loading kernel:"); ++ i = ld_bypass(0x20000000); ++ printk(" done, size %d\n", i); ++#endif + + { + void (*entry)(void *, int) = (void (*)(void*, int)) LOADBASE; +diff -ru proll_18.orig/mrcoffee/openprom.c proll_18/mrcoffee/openprom.c +--- proll_18.orig/mrcoffee/openprom.c 2002-09-13 16:17:03.000000000 +0200 ++++ proll_18/mrcoffee/openprom.c 2004-09-21 21:27:16.000000000 +0200 +@@ -144,10 +144,14 @@ + }; + + static int cpu_nctx = NCTX_SWIFT; ++static int cpu_cache_line_size = 0x20; ++static int cpu_cache_nlines = 0x200; + static struct property propv_cpu[] = { + {"name", "STP1012PGA", sizeof("STP1012PGA") }, + {"device_type", "cpu", 4 }, + {"mmu-nctx", (char*)&cpu_nctx, sizeof(int)}, ++ {"cache-line-size", (char*)&cpu_cache_line_size, sizeof(int)}, ++ {"cache-nlines", (char*)&cpu_cache_nlines, sizeof(int)}, + {NULL, NULL, -1} + }; + |