diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2017-04-25 10:27:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 10:27:49 -0500 |
| commit | f3ea13df5d5bb94b93a7ad4c2d4932a58b50e53e (patch) | |
| tree | 36ee535fe6b1ddb1ef1461a57be23b7bb888ed16 /openpower | |
| parent | d3a495c8dbece20208763f6000d10c5206a2a24d (diff) | |
| parent | 9407b0acc8da9b719231d8f305187c307cfd4698 (diff) | |
| download | talos-op-build-f3ea13df5d5bb94b93a7ad4c2d4932a58b50e53e.tar.gz talos-op-build-f3ea13df5d5bb94b93a7ad4c2d4932a58b50e53e.zip | |
Merge pull request #1027 from sammj/rtc
linux: Disable GEN_RTC
Diffstat (limited to 'openpower')
| -rw-r--r-- | openpower/configs/linux/skiroot_defconfig | 3 | ||||
| -rw-r--r-- | openpower/configs/linux/skiroot_p9_defconfig | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig index d8b8b1b1..a43fdd92 100644 --- a/openpower/configs/linux/skiroot_defconfig +++ b/openpower/configs/linux/skiroot_defconfig @@ -39,7 +39,6 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_PPC_PSERIES is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_IDLE=y -CONFIG_GEN_RTC=y CONFIG_HZ_100=y CONFIG_KEXEC=y CONFIG_IRQ_ALL_CPUS=y @@ -189,6 +188,8 @@ CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_HCD_PPC_OF is not set CONFIG_USB_OHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_GENERIC=m CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_PCI=y # CONFIG_IOMMU_SUPPORT is not set diff --git a/openpower/configs/linux/skiroot_p9_defconfig b/openpower/configs/linux/skiroot_p9_defconfig index a6f9452c..bb96f511 100644 --- a/openpower/configs/linux/skiroot_p9_defconfig +++ b/openpower/configs/linux/skiroot_p9_defconfig @@ -39,7 +39,6 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_PPC_PSERIES is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_IDLE=y -CONFIG_GEN_RTC=y CONFIG_HZ_100=y CONFIG_KEXEC=y CONFIG_IRQ_ALL_CPUS=y @@ -180,6 +179,8 @@ CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_HCD_PPC_OF is not set CONFIG_USB_OHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_GENERIC=m CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_PCI=y # CONFIG_IOMMU_SUPPORT is not set |
