From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KIlun-0005Nm-4g for qemu-devel@nongnu.org; Tue, 15 Jul 2008 10:54:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KIlum-0005Na-BF for qemu-devel@nongnu.org; Tue, 15 Jul 2008 10:54:04 -0400 Received: from [199.232.76.173] (port=37027 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KIlum-0005NX-4G for qemu-devel@nongnu.org; Tue, 15 Jul 2008 10:54:04 -0400 Received: from savannah.gnu.org ([199.232.41.3]:57162 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 1KIlul-0006Ec-Ao for qemu-devel@nongnu.org; Tue, 15 Jul 2008 10:54:03 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1KIluk-00069Z-Fb for qemu-devel@nongnu.org; Tue, 15 Jul 2008 14:54:02 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1KIluk-00069O-4n for qemu-devel@nongnu.org; Tue, 15 Jul 2008 14:54: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: Tue, 15 Jul 2008 14:54:02 +0000 Subject: [Qemu-devel] [4870] Add idprom 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: 4870 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4870 Author: blueswir1 Date: 2008-07-15 14:54:01 +0000 (Tue, 15 Jul 2008) Log Message: ----------- Add idprom Modified Paths: -------------- trunk/hw/sun4u.c Modified: trunk/hw/sun4u.c =================================================================== --- trunk/hw/sun4u.c 2008-07-15 14:52:09 UTC (rev 4869) +++ trunk/hw/sun4u.c 2008-07-15 14:54:01 UTC (rev 4870) @@ -98,7 +98,8 @@ const char *cmdline, uint32_t initrd_image, uint32_t initrd_size, uint32_t NVRAM_image, - int width, int height, int depth) + int width, int height, int depth, + const uint8_t *macaddr) { unsigned int i; uint32_t start, end; @@ -172,6 +173,8 @@ end = 0x1fd0; OpenBIOS_finish_partition(part_header, end - start); + Sun_init_header((struct Sun_nvram *)&image[0x1fd8], macaddr, 0x80); + for (i = 0; i < sizeof(image); i++) m48t59_write(nvram, i, image[i]); @@ -396,12 +399,13 @@ floppy_controller = fdctrl_init(NULL/*6*/, 2, 0, 0x3f0, fd); nvram = m48t59_init(NULL/*8*/, 0, 0x0074, NVRAM_SIZE, 59); sun4u_NVRAM_set_params(nvram, NVRAM_SIZE, "Sun4u", RAM_size, boot_devices, - KERNEL_LOAD_ADDR, kernel_size, - kernel_cmdline, - INITRD_LOAD_ADDR, initrd_size, - /* XXX: need an option to load a NVRAM image */ - 0, - graphic_width, graphic_height, graphic_depth); + KERNEL_LOAD_ADDR, kernel_size, + kernel_cmdline, + INITRD_LOAD_ADDR, initrd_size, + /* XXX: need an option to load a NVRAM image */ + 0, + graphic_width, graphic_height, graphic_depth, + (uint8_t *)&nd_table[0].macaddr); }