| Message ID | 20161018181305.k2nep2feqo5pfwpg@xps13.dannf |
|---|---|
| State | New |
| Headers | show |
That works for me. rtg
On Tue, Oct 18, 2016 at 12:13:05PM -0600, dann frazier wrote: > On Tue, Oct 18, 2016 at 09:25:59AM -0700, Tim Gardner wrote: > > BugLink: http://bugs.launchpad.net/bugs/1608854 > > > > This config option was inadvertently set to =m during > > the UEFI backporting process. > > > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > > --- > > debian.master/config/config.common.ubuntu | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > > index a93f97d..a1603b9 100644 > > --- a/debian.master/config/config.common.ubuntu > > +++ b/debian.master/config/config.common.ubuntu > > @@ -5356,7 +5356,7 @@ CONFIG_RTC_DRV_DS1672=m > > CONFIG_RTC_DRV_DS1742=m > > CONFIG_RTC_DRV_DS2404=m > > CONFIG_RTC_DRV_DS3234=m > > -CONFIG_RTC_DRV_EFI=m > > +CONFIG_RTC_DRV_EFI=y > > CONFIG_RTC_DRV_EM3027=m > > CONFIG_RTC_DRV_FM3130=m > > CONFIG_RTC_DRV_GENERIC=m > > Thanks Tim. However, you may want to avoid setting this to =y on > x86. Upstream later disabled that option in Kconfig because it causes > crashes w/ some implementations. See upstream commit ea1f56504ecb. > > If you want to avoid that, here's an alternate patch: Except the commit you reference is applied to trusty and makes it so that the option cannot be enabled on x86. And if you take your patch and run updateconfigs you get Tim's changes. So Tim's patch is the one we should use. Thanks, Seth
On Wed, Oct 19, 2016 at 7:21 AM, Seth Forshee <seth.forshee@canonical.com> wrote: > On Tue, Oct 18, 2016 at 12:13:05PM -0600, dann frazier wrote: >> On Tue, Oct 18, 2016 at 09:25:59AM -0700, Tim Gardner wrote: >> > BugLink: http://bugs.launchpad.net/bugs/1608854 >> > >> > This config option was inadvertently set to =m during >> > the UEFI backporting process. >> > >> > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> >> > --- >> > debian.master/config/config.common.ubuntu | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu >> > index a93f97d..a1603b9 100644 >> > --- a/debian.master/config/config.common.ubuntu >> > +++ b/debian.master/config/config.common.ubuntu >> > @@ -5356,7 +5356,7 @@ CONFIG_RTC_DRV_DS1672=m >> > CONFIG_RTC_DRV_DS1742=m >> > CONFIG_RTC_DRV_DS2404=m >> > CONFIG_RTC_DRV_DS3234=m >> > -CONFIG_RTC_DRV_EFI=m >> > +CONFIG_RTC_DRV_EFI=y >> > CONFIG_RTC_DRV_EM3027=m >> > CONFIG_RTC_DRV_FM3130=m >> > CONFIG_RTC_DRV_GENERIC=m >> >> Thanks Tim. However, you may want to avoid setting this to =y on >> x86. Upstream later disabled that option in Kconfig because it causes >> crashes w/ some implementations. See upstream commit ea1f56504ecb. >> >> If you want to avoid that, here's an alternate patch: > > Except the commit you reference is applied to trusty and makes it so > that the option cannot be enabled on x86. And if you take your patch and > run updateconfigs you get Tim's changes. So Tim's patch is the one we > should use. Ah - right you are :) Must not have ran updateconfigs after editconfigs on my end. -dann
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 4204ad9..8fcbadc 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -151,6 +151,7 @@ CONFIG_RT2800USB_UNKNOWN=y # CONFIG_RT2X00_LIB_DEBUGFS is not set CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_EFI=m CONFIG_SAMSUNG_USB2PHY=m CONFIG_SAMSUNG_USB3PHY=m CONFIG_SATA_AHCI_PLATFORM=m diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 82c6c90..2dc7a0e 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -121,6 +121,7 @@ CONFIG_RFKILL=y # CONFIG_RT2800USB_UNKNOWN is not set # CONFIG_RT2X00_LIB_DEBUGFS is not set CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_EFI=y CONFIG_RTC_DRV_PL031=m CONFIG_SAMSUNG_USB2PHY=m CONFIG_SAMSUNG_USB3PHY=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 027bc81..e98f46f 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -125,6 +125,7 @@ CONFIG_RFKILL=y CONFIG_RT2X00_LIB_DEBUGFS=y CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_EFI=m CONFIG_RTC_DRV_PL031=y CONFIG_SAMSUNG_USB2PHY=m CONFIG_SAMSUNG_USB3PHY=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index a93f97d..6a5e546 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5356,7 +5356,6 @@ CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_DS1742=m CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_DS3234=m -CONFIG_RTC_DRV_EFI=m CONFIG_RTC_DRV_EM3027=m CONFIG_RTC_DRV_FM3130=m CONFIG_RTC_DRV_GENERIC=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index e42c57c..ff7c4e9 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -148,6 +148,7 @@ CONFIG_RT2800USB_UNKNOWN=y # CONFIG_RT2X00_LIB_DEBUGFS is not set CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_EFI=m CONFIG_SAMSUNG_USB2PHY=m CONFIG_SAMSUNG_USB3PHY=m CONFIG_SATA_AHCI_PLATFORM=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 67d7e73..5483f00 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -169,6 +169,7 @@ CONFIG_RT2800USB_UNKNOWN=y # CONFIG_RT2X00_LIB_DEBUGFS is not set # CONFIG_RTAS_FLASH is not set CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_EFI=m CONFIG_SAMSUNG_USB2PHY=m CONFIG_SAMSUNG_USB3PHY=m CONFIG_SATA_AHCI_PLATFORM=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index f0e7fa5..054609d 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -210,6 +210,7 @@ CONFIG_RT2X00_LIB_DEBUGFS=y CONFIG_RTAS_FLASH=m CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_EFI=m # CONFIG_SAMSUNG_USB2PHY is not set # CONFIG_SAMSUNG_USB3PHY is not set CONFIG_SATA_AHCI_PLATFORM=m