From 0d31cb9954bf864f7cf189d9a9198ff17e28a1c9 Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Tue, 15 Jul 2008 14:54:01 +0000 Subject: [PATCH] Add idprom git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4870 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/sun4u.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index c648314a66..e8280dd7ab 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -98,7 +98,8 @@ static int sun4u_NVRAM_set_params (m48t59_t *nvram, uint16_t NVRAM_size, 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 @@ static int sun4u_NVRAM_set_params (m48t59_t *nvram, uint16_t NVRAM_size, 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 @@ static void sun4u_init(ram_addr_t RAM_size, int vga_ram_size, 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); } -- 2.11.0