Skip to contentSkip to conversation

Patch "mtd: physmap_of: really fix the physmap add-ons" has been added to the 4.11-stable tree

PATCH [email protected] 1 participant 1 message Jun 18, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

mtd: physmap_of: really fix the physmap add-ons

to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mtd-physmap_of-really-fix-the-physmap-add-ons.patch
and it can be found in the queue-4.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 8c925b263584e5a37244297ea9bd072020265fd4 Mon Sep 17 00:00:00 2001

From: Linus Walleij <[email protected]>
Date: Thu, 30 Mar 2017 17:36:39 +0200
Subject: mtd: physmap_of: really fix the physmap add-ons

From: Linus Walleij <[email protected]>

commit 8c925b263584e5a37244297ea9bd072020265fd4 upstream.

The current way of building the of_physmap add-ons result in just the add-on being in the object code, and not the actual core implementation and regress the Gemini and Versatile.

Bake the physmap_of.o object by baking physmap_of_core.o and adding the Versatile and/or Gemini add-ons to the final object. Rename the source file physmap_of_core.c to get the desired build components.

Fixes 4f04f68e1598 ("mtd: physmap_of: fixup gemini/versatile dependencies")
---
 drivers/mtd/maps/Makefile          |   10 
 drivers/mtd/maps/physmap_of.c      |  389 -------------------------------------
 drivers/mtd/maps/physmap_of_core.c |  389 +++++++++++++++++++++++++++++++++++++
 3 files changed, 393 insertions(+), 395 deletions(-)
drivers/mtd/maps/Makefile +4 -6
@@ -17,12 +17,10 @@ obj-$(CONFIG_MTD_CK804XROM)	+= ck804xrom
 obj-$(CONFIG_MTD_TSUNAMI)	+= tsunami_flash.o
 obj-$(CONFIG_MTD_PXA2XX)	+= pxa2xx-flash.o
 obj-$(CONFIG_MTD_PHYSMAP)	+= physmap.o
-ifdef CONFIG_MTD_PHYSMAP_OF_VERSATILE
-physmap_of-objs += physmap_of_versatile.o
-endif
-ifdef CONFIG_MTD_PHYSMAP_OF_GEMINI
-physmap_of-objs += physmap_of_gemini.o
-endif
+physmap_of-objs-y		+= physmap_of_core.o
+physmap_of-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o
+physmap_of-objs-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o
+physmap_of-objs			:= $(physmap_of-objs-y)
 obj-$(CONFIG_MTD_PHYSMAP_OF)	+= physmap_of.o
 obj-$(CONFIG_MTD_PISMO)		+= pismo.o
 obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcmsp-flash.o
drivers/mtd/maps/physmap_of.c deleted +0 -389

389 lines not on this page · raw message

drivers/mtd/maps/physmap_of_core.c new file +389 -0

389 lines not on this page · raw message

Patches currently in stable-queue which might be from [email protected] are

queue-4.11/mtd-physmap_of-really-fix-the-physmap-add-ons.patch