merged Bruce
On Tue, Jul 9, 2019 at 3:51 AM Yongxin Liu <[email protected]> wrote: > > Because CONFIG_DEV_DAX* are not supported in preempt-rt kernel, use > two scc files for Non-RT kerel and RT kernel separately. > > Signed-off-by: Yongxin Liu <[email protected]> > --- > .../intel-persistent-memory/intel-x86-64-dax.cfg | 7 +++++ > .../intel-x86-64-pmem-preempt-rt.scc | 3 +++ > .../intel-persistent-memory/intel-x86-64-pmem.cfg | 31 > ++++++++++++++++++++++ > .../intel-persistent-memory/intel-x86-64-pmem.scc | 4 +++ > 4 files changed, 45 insertions(+) > create mode 100644 features/intel-persistent-memory/intel-x86-64-dax.cfg > create mode 100644 > features/intel-persistent-memory/intel-x86-64-pmem-preempt-rt.scc > create mode 100644 features/intel-persistent-memory/intel-x86-64-pmem.cfg > create mode 100644 features/intel-persistent-memory/intel-x86-64-pmem.scc > > diff --git a/features/intel-persistent-memory/intel-x86-64-dax.cfg > b/features/intel-persistent-memory/intel-x86-64-dax.cfg > new file mode 100644 > index 00000000..6b4d2ff6 > --- /dev/null > +++ b/features/intel-persistent-memory/intel-x86-64-dax.cfg > @@ -0,0 +1,7 @@ > +# > +# Device Drivers > +# > +CONFIG_DEV_DAX=m > +CONFIG_DEV_DAX_PMEM=m > +CONFIG_DEV_DAX_KMEM=m > +CONFIG_DEV_DAX_PMEM_COMPAT=m > diff --git > a/features/intel-persistent-memory/intel-x86-64-pmem-preempt-rt.scc > b/features/intel-persistent-memory/intel-x86-64-pmem-preempt-rt.scc > new file mode 100644 > index 00000000..e42341f7 > --- /dev/null > +++ b/features/intel-persistent-memory/intel-x86-64-pmem-preempt-rt.scc > @@ -0,0 +1,3 @@ > +define KFEATURE_DESCRIPTION "Enable persistent memory support for > intel-x86-64 preempt-rt" > + > +kconf hardware intel-x86-64-pmem.cfg > diff --git a/features/intel-persistent-memory/intel-x86-64-pmem.cfg > b/features/intel-persistent-memory/intel-x86-64-pmem.cfg > new file mode 100644 > index 00000000..914e38a6 > --- /dev/null > +++ b/features/intel-persistent-memory/intel-x86-64-pmem.cfg > @@ -0,0 +1,31 @@ > +# > +# Processor type and features > +# > +CONFIG_X86_PMEM_LEGACY=m > + > +# > +# Memory Management options > +# > +CONFIG_MEMORY_HOTPLUG=y > +CONFIG_MEMORY_HOTREMOVE=y > +CONFIG_ZONE_DEVICE=y > + > +# > +# Device Drivers > +# > +CONFIG_LIBNVDIMM=m > +CONFIG_BLK_DEV_PMEM=m > +CONFIG_ND_BLK=m > +CONFIG_BTT=y > +CONFIG_NVDIMM_PFN=y > +CONFIG_NVDIMM_DAX=y > + > +# > +# Power management and ACPI options > +# > +CONFIG_ACPI_NFIT=m > + > +# > +# File systems > +# > +CONFIG_FS_DAX=y > diff --git a/features/intel-persistent-memory/intel-x86-64-pmem.scc > b/features/intel-persistent-memory/intel-x86-64-pmem.scc > new file mode 100644 > index 00000000..1f67c6a9 > --- /dev/null > +++ b/features/intel-persistent-memory/intel-x86-64-pmem.scc > @@ -0,0 +1,4 @@ > +define KFEATURE_DESCRIPTION "Enable persistent memory support for > intel-x86-64" > + > +kconf hardware intel-x86-64-pmem.cfg > +kconf hardware intel-x86-64-dax.cfg > -- > 2.14.4 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- _______________________________________________ linux-yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/linux-yocto
