Author: mcayland Date: Thu Jan 31 22:37:13 2013 New Revision: 1097 URL: http://tracker.coreboot.org/trac/openbios/changeset/1097
Log: macio.c: Fix double nvram entry on newworld
There are two nvram entries on newworld (for example qemu -M mac99)
The first one (nvram@fff04000) has initialized .properties while the other one has words.
0 > dev / ls ... fff75e24 pci@f2000000 fff77848 nvram@fff04000 fff778e0 nvram ok 0 > dev /nvram@fff04000 ok 0 > words ok 0 > .properties name "nvram" reg fff04000 00004000 device_type "nvram" compatible "nvram,flash" ok 0 > dev /nvram@0 ok 0 > words close open seek write read size ok 0 > .properties name "nvram" ok
This patch fixes initialization, so only one node is created containing both .properties and words.
0 > dev / ls ... fff75e24 pci@f2000000 fff77868 nvram@fff04000 ok 0 > dev /nvram@fff04000 ok 0 > words close open seek write read size ok 0 > .properties name "nvram" reg fff04000 00004000 device_type "nvram" compatible "nvram,flash" ok
Signed-off-by: Amadeusz Sławiński amade@asmblr.net Signed-off-by: Mark Cave-Ayland mark.cave-ayland@ilande.co.uk
Modified: trunk/openbios-devel/drivers/macio.c
Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sat Jan 26 13:50:15 2013 (r1096) +++ trunk/openbios-devel/drivers/macio.c Thu Jan 31 22:37:13 2013 (r1097) @@ -57,12 +57,6 @@ } else { nvram_offset = NW_IO_NVRAM_OFFSET; nvram_size = NW_IO_NVRAM_SIZE; - push_str("/"); - fword("find-device"); - fword("new-device"); - push_str("nvram"); - fword("device-name"); - fword("finish-device"); } nvram = (char*)addr + nvram_offset; snprintf(buf, sizeof(buf), "%s/nvram", path);