Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89a7be58 authored by Kenny Root's avatar Kenny Root Committed by Alistair Delva
Browse files

ANDROID: gki_defconfig: enable NVDIMM/PMEM options 



Options needed for the virtual platform and physical platforms via DT
to define PMEM regions for resume-on-reboot feature

Bug: 146400078
Change-Id: Icaffbd3a7425ac3d9914378fb356d32f9393eec0
Signed-off-by: default avatarKenny Root <kroot@google.com>
parent 748a437c

arch/arm64/configs/gki_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ CONFIG_DMADEVICES=y 
CONFIG_UIO=y

CONFIG_VIRTIO_PCI=m

# CONFIG_VIRTIO_PCI_LEGACY is not set

CONFIG_VIRTIO_PMEM=m

CONFIG_VIRTIO_INPUT=m

CONFIG_VIRTIO_MMIO=m

CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
@@ -395,6 +396,9 @@ CONFIG_GENERIC_PHY=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_LIBNVDIMM=y

# CONFIG_ND_BLK is not set

# CONFIG_BTT is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_F2FS_FS=y

arch/x86/configs/gki_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ CONFIG_RTC_DRV_TEST=m 
CONFIG_UIO=y

CONFIG_VIRTIO_PCI=m

# CONFIG_VIRTIO_PCI_LEGACY is not set

CONFIG_VIRTIO_PMEM=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_INPUT=m

CONFIG_VIRTIO_MMIO=m
@@ -332,6 +333,9 @@ CONFIG_PM_DEVFREQ=y 
CONFIG_IIO=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_LIBNVDIMM=y

# CONFIG_ND_BLK is not set

# CONFIG_BTT is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

cuttlefish.fragment

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ CONFIG_SND_INTEL8X0=m 
CONFIG_USB_DUMMY_HCD=m

CONFIG_RTC_DRV_TEST=m

CONFIG_VIRTIO_PCI=m

CONFIG_VIRTIO_PMEM=m

CONFIG_VIRTIO_INPUT=m

CONFIG_VIRTIO_MMIO=m

CONFIG_ION=m