diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-21 10:56:09 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-21 10:56:09 +0100 |
commit | ff5667ed53c544c4dc88dcd7cb23cc509c9a55e0 (patch) | |
tree | 68ab499eebf7011c0956792f06341ac33ac59794 /include/hw | |
parent | 211ad3b412fe1b8edcb7db0bb97e766a39b2be14 (diff) | |
parent | 8d9329719cc0996e5837fb466ca4d7be8030f8c9 (diff) |
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging
qemu-sparc update
# gpg: Signature made Thu 21 Sep 2017 08:42:30 BST
# gpg: using RSA key 0x5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C C9C4 5BC2 C56F AE0F 321F
* remotes/mcayland/tags/qemu-sparc-signed:
sun4u: use sunhme as default on-board NIC
net: add Sun HME (Happy Meal Ethernet) on-board NIC
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
-rw-r--r-- | include/hw/net/mii.h | 4 | ||||
-rw-r--r-- | include/hw/pci/pci_ids.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/hw/net/mii.h b/include/hw/net/mii.h index 6ce48a6d78..4ae4dcce7e 100644 --- a/include/hw/net/mii.h +++ b/include/hw/net/mii.h @@ -104,6 +104,10 @@ #define RTL8211E_PHYID1 0x001c #define RTL8211E_PHYID2 0xc915 +/* National Semiconductor DP83840 */ +#define DP83840_PHYID1 0x2000 +#define DP83840_PHYID2 0x5c01 + /* National Semiconductor DP83848 */ #define DP83848_PHYID1 0x2000 #define DP83848_PHYID2 0x5c90 diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h index b9c2bad851..35df1874a9 100644 --- a/include/hw/pci/pci_ids.h +++ b/include/hw/pci/pci_ids.h @@ -187,6 +187,7 @@ #define PCI_VENDOR_ID_SUN 0x108e #define PCI_DEVICE_ID_SUN_EBUS 0x1000 +#define PCI_DEVICE_ID_SUN_HME 0x1001 #define PCI_DEVICE_ID_SUN_SIMBA 0x5000 #define PCI_DEVICE_ID_SUN_SABRE 0xa000 |