Mercurial > hg > aboriginal

annotate sources/patches/qemu-sh4-append.patch @ 680:924527b0b454

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix ppc bios, this is the one from qemu svn 6657.
author Rob Landley <rob@landley.net>
date Mon, 30 Mar 2009 04:50:02 -0500
parents 0d6c67c401e0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
651
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
1 diff -ru qemu-0.10.0/hw/r2d.c qemu-0.10.0.new/hw/r2d.c
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
2 --- qemu-0.10.0/hw/r2d.c 2009-03-04 16:54:45.000000000 -0600
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
3 +++ qemu-0.10.0.new/hw/r2d.c 2009-03-18 12:42:25.000000000 -0500
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
4 @@ -233,20 +233,25 @@
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
5 pci_nic_init(pci, &nd_table[i], (i==0)? 2<<3: -1, "rtl8139");
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
6
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
7 /* Todo: register on board registers */
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
8 - {
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
9 + if (kernel_filename) {
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
10 int kernel_size;
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
11 /* initialization which should be done by firmware */
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
12 stl_phys(SH7750_BCR1, 1<<3); /* cs3 SDRAM */
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
13 stw_phys(SH7750_BCR2, 3<<(3*2)); /* cs3 32bit */
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
14
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
15 - kernel_size = load_image(kernel_filename, phys_ram_base);
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
16 + if (kernel_cmdline) {
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
17 + kernel_size = load_image(kernel_filename, phys_ram_base + 0x80000);
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
18 + env->pc = (SDRAM_BASE + 0x80000) | 0xa0000000;
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
19 + pstrcpy(phys_ram_base + 0x10100, 256, kernel_cmdline);
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
20 + } else {
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
21 + kernel_size = load_image(kernel_filename, phys_ram_base);
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
22 + env->pc = SDRAM_BASE | 0xa0000000; /* Start from P2 area */
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
23 + }
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
24
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
25 if (kernel_size < 0) {
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
26 fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
27 exit(1);
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
28 }
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
29 -
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
30 - env->pc = SDRAM_BASE | 0xa0000000; /* Start from P2 area */
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
31 }
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
32 }
0d6c67c401e0 Fix qemu build and add sh4 -append patch.
Rob Landley <rob@landley.net>
parents:
diff changeset
33