[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 12/14] hw/nvram/Kconfig: Add an entry for the NMC93xx EEPROM
From: |
Paolo Bonzini |
Subject: |
Re: [PATCH 12/14] hw/nvram/Kconfig: Add an entry for the NMC93xx EEPROM |
Date: |
Tue, 7 Jan 2020 11:08:46 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 |
On 01/01/20 11:31, Philippe Mathieu-Daudé wrote:
> On 12/31/19 7:32 PM, Philippe Mathieu-Daudé wrote:
>> The NMC93xx EEPROM is only used by few NIC cards and the
>> Am53C974 SCSI controller.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
>> ---
>> Cc: Stefan Weil <address@hidden>
>> ---
>> hw/net/Kconfig | 2 ++
>> hw/nvram/Kconfig | 4 ++++
>> hw/nvram/Makefile.objs | 2 +-
>> hw/scsi/Kconfig | 1 +
>> 4 files changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/net/Kconfig b/hw/net/Kconfig
>> index 3856417d42..af6a11baf3 100644
>> --- a/hw/net/Kconfig
>> +++ b/hw/net/Kconfig
>> @@ -14,6 +14,7 @@ config EEPRO100_PCI
>> bool
>> default y if PCI_DEVICES
>> depends on PCI
>> + select NMC93XX_EEPROM
>> config PCNET_PCI
>> bool
>> @@ -28,6 +29,7 @@ config TULIP
>> bool
>> default y if PCI_DEVICES
>> depends on PCI
>> + select NMC93XX_EEPROM
>> config E1000_PCI
>> bool
>> diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig
>> index ebaa749ce9..e082a5610c 100644
>> --- a/hw/nvram/Kconfig
>> +++ b/hw/nvram/Kconfig
>> @@ -7,3 +7,7 @@ config AT24C
>> config MAC_NVRAM
>> bool
>> +
>> +# NMC93XX uses the NS μWire interface (similar to SPI but less
>> configurable)
Changed to uWire. Gotta love Python 3. :)
Paolo
> Ah this line triggers:
>
> Traceback (most recent call last):
> File "/root/src/github.com/philmd/qemu/scripts/minikconf.py", line
> 700, in <module>
> parser.parse_file(fp)
> File "/root/src/github.com/philmd/qemu/scripts/minikconf.py", line
> 362, in parse_file
> self.parse_config()
> File "/root/src/github.com/philmd/qemu/scripts/minikconf.py", line
> 575, in parse_config
> self.parse_clause()
> File "/root/src/github.com/philmd/qemu/scripts/minikconf.py", line
> 564, in parse_clause
> self.do_include(val)
> File "/root/src/github.com/philmd/qemu/scripts/minikconf.py", line
> 413, in do_include
> KconfigParser(self.data).parse_file(fp)
> File "/root/src/github.com/philmd/qemu/scripts/minikconf.py", line
> 355, in parse_file
> self.src = fp.read()
> File "/usr/lib/python3.5/encodings/ascii.py", line 26, in decode
> return codecs.ascii_decode(input, self.errors)[0]
> UnicodeDecodeError: 'ascii' codec can't decode byte 0xce in position
> 138: ordinal not in range(128)
>
>> +config NMC93XX_EEPROM
>> + bool
>> diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs
>> index 26f7b4ca35..a4bdfbf187 100644
>> --- a/hw/nvram/Makefile.objs
>> +++ b/hw/nvram/Makefile.objs
>> @@ -1,5 +1,5 @@
>> common-obj-$(CONFIG_DS1225Y) += ds1225y.o
>> -common-obj-y += eeprom93xx.o
>> +common-obj-$(CONFIG_NMC93XX_EEPROM) += eeprom93xx.o
>> common-obj-$(CONFIG_AT24C) += eeprom_at24c.o
>> common-obj-y += fw_cfg.o
>> common-obj-y += chrp_nvram.o
>> diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig
>> index b3ba540c17..77d397c949 100644
>> --- a/hw/scsi/Kconfig
>> +++ b/hw/scsi/Kconfig
>> @@ -34,6 +34,7 @@ config ESP_PCI
>> default y if PCI_DEVICES
>> depends on PCI
>> select ESP
>> + select NMC93XX_EEPROM
>> config SPAPR_VSCSI
>> bool
>>
>