gwj / at91sam9263 · Commits

Commit 79266dbd9ebb56ee20a72ce94d385388a689c71c

Authored by bellard
1 parent 84631fd7

updated 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2178 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 39 additions and 34 deletions
pc-bios/bios.bin
View file @79266db
No preview for this file type
pc-bios/bios.diff
  View file @79266db
1 -diff -ruN --exclude Makefile bios/acpi-dsdt.dsl bios.new/acpi-dsdt.dsl  
2 ---- bios/acpi-dsdt.dsl 1970-01-01 01:00:00.000000000 +0100  
3 -+++ bios.new/acpi-dsdt.dsl 2006-09-24 20:27:54.000000000 +0200 1 +diff -ruN --exclude Makefile bios.org/acpi-dsdt.dsl bios/acpi-dsdt.dsl
  2 +--- bios.org/acpi-dsdt.dsl 1970-01-01 01:00:00.000000000 +0100
  3 ++++ bios/acpi-dsdt.dsl 2006-09-24 20:27:54.000000000 +0200
4 @@ -0,0 +1,559 @@ 4 @@ -0,0 +1,559 @@
5 +/* 5 +/*
6 + * QEMU ACPI DSDT ASL definition 6 + * QEMU ACPI DSDT ASL definition
@@ -561,9 +561,9 @@ diff -ruN --exclude Makefile bios/acpi-dsdt.dsl bios.new/acpi-dsdt.dsl @@ -561,9 +561,9 @@ diff -ruN --exclude Makefile bios/acpi-dsdt.dsl bios.new/acpi-dsdt.dsl
561 + 0x00, // reserved 561 + 0x00, // reserved
562 + }) 562 + })
563 +} 563 +}
564 -diff -ruN --exclude Makefile bios/acpi-dsdt.hex bios.new/acpi-dsdt.hex  
565 ---- bios/acpi-dsdt.hex 1970-01-01 01:00:00.000000000 +0100  
566 -+++ bios.new/acpi-dsdt.hex 2006-09-24 20:27:54.000000000 +0200 564 +diff -ruN --exclude Makefile bios.org/acpi-dsdt.hex bios/acpi-dsdt.hex
  565 +--- bios.org/acpi-dsdt.hex 1970-01-01 01:00:00.000000000 +0100
  566 ++++ bios/acpi-dsdt.hex 2006-09-24 20:27:54.000000000 +0200
567 @@ -0,0 +1,278 @@ 567 @@ -0,0 +1,278 @@
568 +/* 568 +/*
569 + * 569 + *
@@ -843,10 +843,10 @@ diff -ruN --exclude Makefile bios/acpi-dsdt.hex bios.new/acpi-dsdt.hex @@ -843,10 +843,10 @@ diff -ruN --exclude Makefile bios/acpi-dsdt.hex bios.new/acpi-dsdt.hex
843 + 0x53,0x35,0x5F,0x12,0x06,0x04,0x00,0x00, /* 00000828 "S5_....." */ 843 + 0x53,0x35,0x5F,0x12,0x06,0x04,0x00,0x00, /* 00000828 "S5_....." */
844 + 0x00,0x00, 844 + 0x00,0x00,
845 +}; 845 +};
846 -Binary files bios/BIOS-bochs-latest and bios.new/BIOS-bochs-latest differ  
847 -diff -ruN --exclude Makefile bios/Makefile.in bios.new/Makefile.in  
848 ---- bios/Makefile.in 2006-01-13 18:36:27.000000000 +0100  
849 -+++ bios.new/Makefile.in 2006-09-24 20:26:39.000000000 +0200 846 +Binary files bios.org/BIOS-bochs-latest and bios/BIOS-bochs-latest differ
  847 +diff -ruN --exclude Makefile bios.org/Makefile.in bios/Makefile.in
  848 +--- bios.org/Makefile.in 2006-01-13 18:36:27.000000000 +0100
  849 ++++ bios/Makefile.in 2006-09-24 21:37:05.000000000 +0200
850 @@ -61,7 +61,8 @@ 850 @@ -61,7 +61,8 @@
851 851
852 clean: 852 clean:
@@ -857,7 +857,7 @@ diff -ruN --exclude Makefile bios/Makefile.in bios.new/Makefile.in @@ -857,7 +857,7 @@ diff -ruN --exclude Makefile bios/Makefile.in bios.new/Makefile.in
857 857
858 dist-clean: clean 858 dist-clean: clean
859 @RMCOMMAND@ Makefile 859 @RMCOMMAND@ Makefile
860 -@@ -69,15 +70,35 @@ 860 +@@ -69,15 +70,40 @@
861 bios-clean: 861 bios-clean:
862 @RMCOMMAND@ BIOS-bochs-* 862 @RMCOMMAND@ BIOS-bochs-*
863 863
@@ -882,9 +882,14 @@ diff -ruN --exclude Makefile bios/Makefile.in bios.new/Makefile.in @@ -882,9 +882,14 @@ diff -ruN --exclude Makefile bios/Makefile.in bios.new/Makefile.in
882 +rombios32.out: rombios32start.o rombios32.o rombios32.ld 882 +rombios32.out: rombios32start.o rombios32.o rombios32.ld
883 + ld -o $@ -T rombios32.ld rombios32start.o rombios32.o 883 + ld -o $@ -T rombios32.ld rombios32start.o rombios32.o
884 + 884 +
885 -+rombios32.o: rombios32.c 885 ++rombios32.o: rombios32.c acpi-dsdt.hex
886 + $(GCC) -O2 -Wall -c -o $@ $< 886 + $(GCC) -O2 -Wall -c -o $@ $<
887 + 887 +
  888 ++ifeq ("1", "0")
  889 ++acpi-dsdt.hex: acpi-dsdt.dsl
  890 ++ iasl -tc -p $@ $<
  891 ++endif
  892 ++
888 +rombios32start.o: rombios32start.S 893 +rombios32start.o: rombios32start.S
889 + $(GCC) -c -o $@ $< 894 + $(GCC) -c -o $@ $<
890 + 895 +
@@ -896,9 +901,9 @@ diff -ruN --exclude Makefile bios/Makefile.in bios.new/Makefile.in @@ -896,9 +901,9 @@ diff -ruN --exclude Makefile bios/Makefile.in bios.new/Makefile.in
896 + 901 +
897 biossums: biossums.c 902 biossums: biossums.c
898 $(GCC) -o biossums biossums.c 903 $(GCC) -o biossums biossums.c
899 -diff -ruN --exclude Makefile bios/pad.c bios.new/pad.c  
900 ---- bios/pad.c 1970-01-01 01:00:00.000000000 +0100  
901 -+++ bios.new/pad.c 2006-09-24 20:22:58.000000000 +0200 904 +diff -ruN --exclude Makefile bios.org/pad.c bios/pad.c
  905 +--- bios.org/pad.c 1970-01-01 01:00:00.000000000 +0100
  906 ++++ bios/pad.c 2006-09-24 20:22:58.000000000 +0200
902 @@ -0,0 +1,20 @@ 907 @@ -0,0 +1,20 @@
903 +#include <stdlib.h> 908 +#include <stdlib.h>
904 +#include <stdio.h> 909 +#include <stdio.h>
@@ -920,9 +925,9 @@ diff -ruN --exclude Makefile bios/pad.c bios.new/pad.c @@ -920,9 +925,9 @@ diff -ruN --exclude Makefile bios/pad.c bios.new/pad.c
920 + } 925 + }
921 + return 0; 926 + return 0;
922 +} 927 +}
923 -diff -ruN --exclude Makefile bios/rombios32.c bios.new/rombios32.c  
924 ---- bios/rombios32.c 1970-01-01 01:00:00.000000000 +0100  
925 -+++ bios.new/rombios32.c 2006-09-24 20:22:58.000000000 +0200 928 +diff -ruN --exclude Makefile bios.org/rombios32.c bios/rombios32.c
  929 +--- bios.org/rombios32.c 1970-01-01 01:00:00.000000000 +0100
  930 ++++ bios/rombios32.c 2006-09-24 21:29:27.000000000 +0200
926 @@ -0,0 +1,1324 @@ 931 @@ -0,0 +1,1324 @@
927 +// 32 bit Bochs BIOS init code 932 +// 32 bit Bochs BIOS init code
928 +// Copyright (C) 2006 Fabrice Bellard 933 +// Copyright (C) 2006 Fabrice Bellard
@@ -1490,9 +1495,9 @@ diff -ruN --exclude Makefile bios/rombios32.c bios.new/rombios32.c @@ -1490,9 +1495,9 @@ diff -ruN --exclude Makefile bios/rombios32.c bios.new/rombios32.c
1490 + /* remap the BIOS to shadow RAM an keep it read/write while we 1495 + /* remap the BIOS to shadow RAM an keep it read/write while we
1491 + are writing tables */ 1496 + are writing tables */
1492 + memcpy((void *)BIOS_TMP_STORAGE, (void *)0x000f0000, 0x10000); 1497 + memcpy((void *)BIOS_TMP_STORAGE, (void *)0x000f0000, 0x10000);
1493 -+ v = pci_config_readb(d, 0x67); 1498 ++ v = pci_config_readb(d, 0x59);
1494 + v = (v & 0x0f) | (0x30); 1499 + v = (v & 0x0f) | (0x30);
1495 -+ pci_config_writeb(d, 0x67, v); 1500 ++ pci_config_writeb(d, 0x59, v);
1496 + memcpy((void *)0x000f0000, (void *)BIOS_TMP_STORAGE, 0x10000); 1501 + memcpy((void *)0x000f0000, (void *)BIOS_TMP_STORAGE, 0x10000);
1497 + 1502 +
1498 + i440_pcidev = *d; 1503 + i440_pcidev = *d;
@@ -1503,9 +1508,9 @@ diff -ruN --exclude Makefile bios/rombios32.c bios.new/rombios32.c @@ -1503,9 +1508,9 @@ diff -ruN --exclude Makefile bios/rombios32.c bios.new/rombios32.c
1503 + PCIDevice *d = &i440_pcidev; 1508 + PCIDevice *d = &i440_pcidev;
1504 + int v; 1509 + int v;
1505 + 1510 +
1506 -+ v = pci_config_readb(d, 0x67);  
1507 -+ v = (v & 0x0f) | (0x20);  
1508 -+ pci_config_writeb(d, 0x67, v); 1511 ++ v = pci_config_readb(d, 0x59);
  1512 ++ v = (v & 0x0f) | (0x10);
  1513 ++ pci_config_writeb(d, 0x59, v);
1509 +} 1514 +}
1510 + 1515 +
1511 +static void pci_bios_init_bridges(PCIDevice *d) 1516 +static void pci_bios_init_bridges(PCIDevice *d)
@@ -1553,14 +1558,14 @@ diff -ruN --exclude Makefile bios/rombios32.c bios.new/rombios32.c @@ -1553,14 +1558,14 @@ diff -ruN --exclude Makefile bios/rombios32.c bios.new/rombios32.c
1553 + outb(0xb2, 00); 1558 + outb(0xb2, 00);
1554 + 1559 +
1555 + /* enable the SMM memory window */ 1560 + /* enable the SMM memory window */
1556 -+ pci_config_writel(&i440_pcidev, 0x6c, (1 << 26) | 0x000a); 1561 ++ pci_config_writeb(&i440_pcidev, 0x72, 0x02 | 0x40);
1557 + 1562 +
1558 + /* copy the SMM code */ 1563 + /* copy the SMM code */
1559 + memcpy((void *)0xa8000, &smm_code_start, 1564 + memcpy((void *)0xa8000, &smm_code_start,
1560 + &smm_code_end - &smm_code_start); 1565 + &smm_code_end - &smm_code_start);
1561 + 1566 +
1562 + /* close the SMM memory window and enable normal SMM */ 1567 + /* close the SMM memory window and enable normal SMM */
1563 -+ pci_config_writel(&i440_pcidev, 0x6c, (1 << 31) | 0x000a); 1568 ++ pci_config_writeb(&i440_pcidev, 0x72, 0x02 | 0x08);
1564 +} 1569 +}
1565 +#endif 1570 +#endif
1566 + 1571 +
@@ -2248,9 +2253,9 @@ diff -ruN --exclude Makefile bios/rombios32.c bios.new/rombios32.c @@ -2248,9 +2253,9 @@ diff -ruN --exclude Makefile bios/rombios32.c bios.new/rombios32.c
2248 + bios_lock_shadow_ram(); 2253 + bios_lock_shadow_ram();
2249 + } 2254 + }
2250 +} 2255 +}
2251 -diff -ruN --exclude Makefile bios/rombios32.ld bios.new/rombios32.ld  
2252 ---- bios/rombios32.ld 1970-01-01 01:00:00.000000000 +0100  
2253 -+++ bios.new/rombios32.ld 2006-09-24 20:28:05.000000000 +0200 2256 +diff -ruN --exclude Makefile bios.org/rombios32.ld bios/rombios32.ld
  2257 +--- bios.org/rombios32.ld 1970-01-01 01:00:00.000000000 +0100
  2258 ++++ bios/rombios32.ld 2006-09-24 20:28:05.000000000 +0200
2254 @@ -0,0 +1,19 @@ 2259 @@ -0,0 +1,19 @@
2255 +OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") 2260 +OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
2256 +OUTPUT_ARCH(i386) 2261 +OUTPUT_ARCH(i386)
@@ -2271,9 +2276,9 @@ diff -ruN --exclude Makefile bios/rombios32.ld bios.new/rombios32.ld @@ -2271,9 +2276,9 @@ diff -ruN --exclude Makefile bios/rombios32.ld bios.new/rombios32.ld
2271 + *(.note) 2276 + *(.note)
2272 + } 2277 + }
2273 +} 2278 +}
2274 -diff -ruN --exclude Makefile bios/rombios32start.S bios.new/rombios32start.S  
2275 ---- bios/rombios32start.S 1970-01-01 01:00:00.000000000 +0100  
2276 -+++ bios.new/rombios32start.S 2006-09-24 20:22:58.000000000 +0200 2279 +diff -ruN --exclude Makefile bios.org/rombios32start.S bios/rombios32start.S
  2280 +--- bios.org/rombios32start.S 1970-01-01 01:00:00.000000000 +0100
  2281 ++++ bios/rombios32start.S 2006-09-24 20:22:58.000000000 +0200
2277 @@ -0,0 +1,76 @@ 2282 @@ -0,0 +1,76 @@
2278 +.globl _start 2283 +.globl _start
2279 +.globl smp_ap_boot_code_start 2284 +.globl smp_ap_boot_code_start
@@ -2351,9 +2356,9 @@ diff -ruN --exclude Makefile bios/rombios32start.S bios.new/rombios32start.S @@ -2351,9 +2356,9 @@ diff -ruN --exclude Makefile bios/rombios32start.S bios.new/rombios32start.S
2351 +2: 2356 +2:
2352 + rsm 2357 + rsm
2353 +smm_code_end: 2358 +smm_code_end:
2354 -diff -ruN --exclude Makefile bios/rombios.c bios.new/rombios.c  
2355 ---- bios/rombios.c 2006-08-11 19:34:12.000000000 +0200  
2356 -+++ bios.new/rombios.c 2006-09-24 20:35:47.000000000 +0200 2359 +diff -ruN --exclude Makefile bios.org/rombios.c bios/rombios.c
  2360 +--- bios.org/rombios.c 2006-08-11 19:34:12.000000000 +0200
  2361 ++++ bios/rombios.c 2006-09-24 20:35:47.000000000 +0200
2357 @@ -24,7 +24,7 @@ 2362 @@ -24,7 +24,7 @@
2358 // License along with this library; if not, write to the Free Software 2363 // License along with this library; if not, write to the Free Software
2359 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 2364 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA