From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LWC5h-0004ga-FT for qemu-devel@nongnu.org; Sun, 08 Feb 2009 11:01:05 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LWC5f-0004g7-70 for qemu-devel@nongnu.org; Sun, 08 Feb 2009 11:01:04 -0500 Received: from [199.232.76.173] (port=47996 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LWC5f-0004g2-2O for qemu-devel@nongnu.org; Sun, 08 Feb 2009 11:01:03 -0500 Received: from savannah.gnu.org ([199.232.41.3]:51144 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LWC5e-0004nY-MI for qemu-devel@nongnu.org; Sun, 08 Feb 2009 11:01:02 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LWC5e-0001sb-4f for qemu-devel@nongnu.org; Sun, 08 Feb 2009 16:01:02 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LWC5d-0001sX-Ta for qemu-devel@nongnu.org; Sun, 08 Feb 2009 16:01:02 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Sun, 08 Feb 2009 16:01:01 +0000 Subject: [Qemu-devel] [6561] Use Mac NVRAM Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6561 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6561 Author: blueswir1 Date: 2009-02-08 16:01:01 +0000 (Sun, 08 Feb 2009) Log Message: ----------- Use Mac NVRAM Modified Paths: -------------- trunk/hw/ppc_newworld.c Modified: trunk/hw/ppc_newworld.c =================================================================== --- trunk/hw/ppc_newworld.c 2009-02-08 15:59:36 UTC (rev 6560) +++ trunk/hw/ppc_newworld.c 2009-02-08 16:01:01 UTC (rev 6561) @@ -93,12 +93,8 @@ ram_addr_t ram_offset, vga_ram_offset, bios_offset, vga_bios_offset; uint32_t kernel_base, kernel_size, initrd_base, initrd_size; PCIBus *pci_bus; - nvram_t nvram; -#if 0 MacIONVRAMState *nvr; int nvram_mem_index; -#endif - m48t59_t *m48t59; int vga_bios_size, bios_size; qemu_irq *dummy_irq; int pic_mem_index, dbdma_mem_index, cuda_mem_index, escc_mem_index; @@ -313,27 +309,11 @@ if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8) graphic_depth = 15; -#if 0 /* XXX: this is ugly but needed for now, or OHW won't boot */ + /* The NewWorld NVRAM is not located in the MacIO device */ nvr = macio_nvram_init(&nvram_mem_index, 0x2000, 1); pmac_format_nvram_partition(nvr, 0x2000); macio_nvram_map(nvr, 0xFFF04000); - nvram.opaque = nvr; - nvram.read_fn = &macio_nvram_read; - nvram.write_fn = &macio_nvram_write; -#else - m48t59 = m48t59_init(dummy_irq[8], 0xFFF04000, 0x0074, NVRAM_SIZE, 59); - nvram.opaque = m48t59; - nvram.read_fn = &m48t59_read; - nvram.write_fn = &m48t59_write; -#endif - PPC_NVRAM_set_params(&nvram, NVRAM_SIZE, "MAC99", ram_size, - ppc_boot_device, kernel_base, kernel_size, - kernel_cmdline, - initrd_base, initrd_size, - /* XXX: need an option to load a NVRAM image */ - 0, - graphic_width, graphic_height, graphic_depth); /* No PCI init: the BIOS will do it */ fw_cfg = fw_cfg_init(0, 0, CFG_ADDR, CFG_ADDR + 2);