gwj / at91sam9263 · Commits

Commit ae40972f78241e10340f74e184555dc92e067718

Authored by blueswir1
1 parent 666c87aa

Add SPARCstation 20 machine type (Robert Reif) 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3802 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 3 changed files with 57 additions and 1 deletions
hw/boards.h
  View file @ae40972
... ... @@ -52,7 +52,7 @@ extern QEMUMachine shix_machine;
52 52 extern QEMUMachine r2d_machine;
53 53  
54 54 /* sun4m.c */
55   -extern QEMUMachine ss5_machine, ss10_machine, ss600mp_machine;
  55 +extern QEMUMachine ss5_machine, ss10_machine, ss600mp_machine, ss20_machine;
56 56  
57 57 /* sun4u.c */
58 58 extern QEMUMachine sun4u_machine;
... ...
hw/sun4m.c
  View file @ae40972
... ... @@ -600,6 +600,44 @@ static const struct hwdef hwdefs[] = {
600 600 .max_mem = 0xffffffff, // XXX actually first 62GB ok
601 601 .default_cpu_model = "TI SuperSparc II",
602 602 },
  603 + /* SS-20 */
  604 + {
  605 + .iommu_base = 0xfe0000000ULL,
  606 + .tcx_base = 0xe20000000ULL,
  607 + .cs_base = -1,
  608 + .slavio_base = 0xff0000000ULL,
  609 + .ms_kb_base = 0xff1000000ULL,
  610 + .serial_base = 0xff1100000ULL,
  611 + .nvram_base = 0xff1200000ULL,
  612 + .fd_base = 0xff1700000ULL,
  613 + .counter_base = 0xff1300000ULL,
  614 + .intctl_base = 0xff1400000ULL,
  615 + .dma_base = 0xef0400000ULL,
  616 + .esp_base = 0xef0800000ULL,
  617 + .le_base = 0xef0c00000ULL,
  618 + .power_base = 0xefa000000ULL,
  619 + .ecc_base = 0xf00000000ULL,
  620 + .ecc_version = 0x20000000, // version 0, implementation 2
  621 + .vram_size = 0x00100000,
  622 + .nvram_size = 0x2000,
  623 + .esp_irq = 18,
  624 + .le_irq = 16,
  625 + .clock_irq = 7,
  626 + .clock1_irq = 19,
  627 + .ms_kb_irq = 14,
  628 + .ser_irq = 15,
  629 + .fd_irq = 22,
  630 + .me_irq = 30,
  631 + .cs_irq = -1,
  632 + .machine_id = 0x72,
  633 + .iommu_version = 0x13000000,
  634 + .intbit_to_level = {
  635 + 2, 3, 5, 7, 9, 11, 0, 14, 3, 5, 7, 9, 11, 13, 12, 12,
  636 + 6, 0, 4, 10, 8, 0, 11, 0, 0, 0, 0, 0, 15, 0, 15, 0,
  637 + },
  638 + .max_mem = 0xffffffff, // XXX actually first 62GB ok
  639 + .default_cpu_model = "TI SuperSparc II",
  640 + },
603 641 };
604 642  
605 643 /* SPARCstation 5 hardware initialisation */
... ... @@ -632,6 +670,16 @@ static void ss600mp_init(int RAM_size, int vga_ram_size,
632 670 kernel_cmdline, initrd_filename, cpu_model);
633 671 }
634 672  
  673 +/* SPARCstation 20 hardware initialisation */
  674 +static void ss20_init(int RAM_size, int vga_ram_size,
  675 + const char *boot_device, DisplayState *ds,
  676 + const char *kernel_filename, const char *kernel_cmdline,
  677 + const char *initrd_filename, const char *cpu_model)
  678 +{
  679 + sun4m_hw_init(&hwdefs[3], RAM_size, boot_device, ds, kernel_filename,
  680 + kernel_cmdline, initrd_filename, cpu_model);
  681 +}
  682 +
635 683 QEMUMachine ss5_machine = {
636 684 "SS-5",
637 685 "Sun4m platform, SPARCstation 5",
... ... @@ -649,3 +697,10 @@ QEMUMachine ss600mp_machine = {
649 697 "Sun4m platform, SPARCserver 600MP",
650 698 ss600mp_init,
651 699 };
  700 +
  701 +QEMUMachine ss20_machine = {
  702 + "SS-20",
  703 + "Sun4m platform, SPARCstation 20",
  704 + ss20_init,
  705 +};
  706 +
... ...
... ... @@ -7838,6 +7838,7 @@ static void register_machines(void)
7838 7838 qemu_register_machine(&ss5_machine);
7839 7839 qemu_register_machine(&ss10_machine);
7840 7840 qemu_register_machine(&ss600mp_machine);
  7841 + qemu_register_machine(&ss20_machine);
7841 7842 #endif
7842 7843 #elif defined(TARGET_ARM)
7843 7844 qemu_register_machine(&integratorcp_machine);
... ...