Commit dd703b99 authored by Blue Swirl's avatar Blue Swirl
Browse files

hpet: make optional 



Ignore failure with hpet device creation.

Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 4912371f

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ hw-obj-$(CONFIG_FDC) += fdc.o 
hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o

hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o

hw-obj-$(CONFIG_DMA) += dma.o

hw-obj-$(CONFIG_HPET) += hpet.o



# PPC devices

hw-obj-$(CONFIG_OPENPIC) += openpic.o

Makefile.target

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ obj-$(CONFIG_KVM) += ivshmem.o 
obj-i386-y += vga.o

obj-i386-y += mc146818rtc.o i8259.o pc.o

obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o

obj-i386-y += vmport.o hpet.o applesmc.o

obj-i386-y += vmport.o applesmc.o

obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o

obj-i386-y += debugcon.o multiboot.o

obj-i386-y += pc_piix.o

default-configs/i386-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ CONFIG_IDE_PIIX=y 
CONFIG_NE2000_ISA=y

CONFIG_PIIX_PCI=y

CONFIG_SOUND=y

CONFIG_HPET=y

default-configs/x86_64-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ CONFIG_IDE_PIIX=y 
CONFIG_NE2000_ISA=y

CONFIG_PIIX_PCI=y

CONFIG_SOUND=y

CONFIG_HPET=y

hw/hpet.c

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ typedef struct HPETState { 
    uint8_t  hpet_id;           /* instance id */

} HPETState;



struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};



static uint32_t hpet_in_legacy_mode(HPETState *s)

{

    return s->config & HPET_CFG_LEGACY;