hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/tools/testing/nvdimm/Kbuild
....@@ -1,10 +1,10 @@
11 # SPDX-License-Identifier: GPL-2.0
22 ldflags-y += --wrap=ioremap_wc
33 ldflags-y += --wrap=memremap
4
-ldflags-y += --wrap=devm_ioremap_nocache
4
+ldflags-y += --wrap=devm_ioremap
55 ldflags-y += --wrap=devm_memremap
66 ldflags-y += --wrap=devm_memunmap
7
-ldflags-y += --wrap=ioremap_nocache
7
+ldflags-y += --wrap=ioremap
88 ldflags-y += --wrap=iounmap
99 ldflags-y += --wrap=memunmap
1010 ldflags-y += --wrap=__devm_request_region
....@@ -21,7 +21,8 @@
2121 NVDIMM_SRC := $(DRIVERS)/nvdimm
2222 ACPI_SRC := $(DRIVERS)/acpi/nfit
2323 DAX_SRC := $(DRIVERS)/dax
24
-ccflags-y := -I$(src)/$(NVDIMM_SRC)/
24
+ccflags-y := -I$(srctree)/drivers/nvdimm/
25
+ccflags-y += -I$(srctree)/drivers/acpi/nfit/
2526
2627 obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
2728 obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
....@@ -34,8 +35,11 @@
3435 endif
3536 obj-$(CONFIG_DEV_DAX) += device_dax.o
3637 obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem.o
38
+obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem_core.o
39
+obj-$(CONFIG_DEV_DAX_PMEM_COMPAT) += dax_pmem_compat.o
3740
3841 nfit-y := $(ACPI_SRC)/core.o
42
+nfit-y += $(ACPI_SRC)/intel.o
3943 nfit-$(CONFIG_X86_MCE) += $(ACPI_SRC)/mce.o
4044 nfit-y += acpi_nfit_test.o
4145 nfit-y += config_check.o
....@@ -55,6 +59,7 @@
5559 nd_e820-y += config_check.o
5660
5761 dax-y := $(DAX_SRC)/super.o
62
+dax-y += $(DAX_SRC)/bus.o
5863 dax-y += config_check.o
5964
6065 device_dax-y := $(DAX_SRC)/device.o
....@@ -62,7 +67,12 @@
6267 device_dax-y += device_dax_test.o
6368 device_dax-y += config_check.o
6469
65
-dax_pmem-y := $(DAX_SRC)/pmem.o
70
+dax_pmem-y := $(DAX_SRC)/pmem/pmem.o
71
+dax_pmem-y += dax_pmem_test.o
72
+dax_pmem_core-y := $(DAX_SRC)/pmem/core.o
73
+dax_pmem_core-y += dax_pmem_core_test.o
74
+dax_pmem_compat-y := $(DAX_SRC)/pmem/compat.o
75
+dax_pmem_compat-y += dax_pmem_compat_test.o
6676 dax_pmem-y += config_check.o
6777
6878 libnvdimm-y := $(NVDIMM_SRC)/core.o
....@@ -78,6 +88,8 @@
7888 libnvdimm-$(CONFIG_BTT) += $(NVDIMM_SRC)/btt_devs.o
7989 libnvdimm-$(CONFIG_NVDIMM_PFN) += $(NVDIMM_SRC)/pfn_devs.o
8090 libnvdimm-$(CONFIG_NVDIMM_DAX) += $(NVDIMM_SRC)/dax_devs.o
91
+libnvdimm-$(CONFIG_NVDIMM_KEYS) += $(NVDIMM_SRC)/security.o
92
+libnvdimm-y += dimm_devs.o
8193 libnvdimm-y += libnvdimm_test.o
8294 libnvdimm-y += config_check.o
8395