From: Boris Brezillon Date: Fri, 19 Oct 2018 07:49:03 +0000 (+0200) Subject: mtd: maps: Prepare merging of physmap and physmap_of X-Git-Tag: v5.0-rc1~183^2~25 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0c3def9b58d85ea8a8a8773d1151d8d554842d0a;p=users%2Fwilly%2Fxarray.git mtd: maps: Prepare merging of physmap and physmap_of We want to merge the physmap and physmap_of driver, but before we can do that we must prepare things to create physmap.o out of several .c files. Rename physmap.c into physmap-core.c and add a new Makefile rule to create physmap.o (right now it only contains physmap-core.o). Signed-off-by: Boris Brezillon Reviewed-by: Ricardo Ribalda Delgado Acked-by: Linus Walleij --- diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index 51acf1fec19b..2574909edffd 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile @@ -17,6 +17,8 @@ obj-$(CONFIG_MTD_ICHXROM) += ichxrom.o obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o +physmap-objs-y += physmap-core.o +physmap-objs := $(physmap-objs-y) obj-$(CONFIG_MTD_PHYSMAP) += physmap.o physmap_of-objs-y += physmap_of_core.o physmap_of-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap-core.c similarity index 100% rename from drivers/mtd/maps/physmap.c rename to drivers/mtd/maps/physmap-core.c