* [PATCH v3] mtd: physmap_of: really fix the physmap add-ons
@ 2017-03-30 15:36 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2017-03-30 15:36 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, Cyrille Pitchen, linux-mtd
Cc: linux-arm-kernel, Linus Walleij
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.
Suggested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: 4f04f68e1598 ("mtd: physmap_of: fixup gemini/versatile dependencies")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v2->v3:
- Build and bake the final object in an elegant way suggested
by Boris.
---
drivers/mtd/maps/Makefile | 10 ++++------
drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} | 0
2 files changed, 4 insertions(+), 6 deletions(-)
rename drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} (100%)
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index aef1846b4de2..5a09a72ab112 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -17,12 +17,10 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o
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
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of_core.c
similarity index 100%
rename from drivers/mtd/maps/physmap_of.c
rename to drivers/mtd/maps/physmap_of_core.c
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3] mtd: physmap_of: really fix the physmap add-ons
@ 2017-03-30 15:36 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2017-03-30 15:36 UTC (permalink / raw)
To: linux-arm-kernel
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.
Suggested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: 4f04f68e1598 ("mtd: physmap_of: fixup gemini/versatile dependencies")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v2->v3:
- Build and bake the final object in an elegant way suggested
by Boris.
---
drivers/mtd/maps/Makefile | 10 ++++------
drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} | 0
2 files changed, 4 insertions(+), 6 deletions(-)
rename drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} (100%)
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index aef1846b4de2..5a09a72ab112 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -17,12 +17,10 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o
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
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of_core.c
similarity index 100%
rename from drivers/mtd/maps/physmap_of.c
rename to drivers/mtd/maps/physmap_of_core.c
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3] mtd: physmap_of: really fix the physmap add-ons
2017-03-30 15:36 ` Linus Walleij
@ 2017-03-31 8:04 ` Boris Brezillon
-1 siblings, 0 replies; 6+ messages in thread
From: Boris Brezillon @ 2017-03-31 8:04 UTC (permalink / raw)
To: Linus Walleij
Cc: David Woodhouse, Brian Norris, Marek Vasut, Richard Weinberger,
Cyrille Pitchen, linux-mtd, linux-arm-kernel
On Thu, 30 Mar 2017 17:36:39 +0200
Linus Walleij <linus.walleij@linaro.org> wrote:
> 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.
>
> Suggested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Fixes: 4f04f68e1598 ("mtd: physmap_of: fixup gemini/versatile dependencies")
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> ---
> ChangeLog v2->v3:
> - Build and bake the final object in an elegant way suggested
> by Boris.
> ---
> drivers/mtd/maps/Makefile | 10 ++++------
> drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} | 0
> 2 files changed, 4 insertions(+), 6 deletions(-)
> rename drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} (100%)
>
> diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
> index aef1846b4de2..5a09a72ab112 100644
> --- a/drivers/mtd/maps/Makefile
> +++ b/drivers/mtd/maps/Makefile
> @@ -17,12 +17,10 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o
> 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
> diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of_core.c
> similarity index 100%
> rename from drivers/mtd/maps/physmap_of.c
> rename to drivers/mtd/maps/physmap_of_core.c
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3] mtd: physmap_of: really fix the physmap add-ons
@ 2017-03-31 8:04 ` Boris Brezillon
0 siblings, 0 replies; 6+ messages in thread
From: Boris Brezillon @ 2017-03-31 8:04 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 30 Mar 2017 17:36:39 +0200
Linus Walleij <linus.walleij@linaro.org> wrote:
> 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.
>
> Suggested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Fixes: 4f04f68e1598 ("mtd: physmap_of: fixup gemini/versatile dependencies")
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> ---
> ChangeLog v2->v3:
> - Build and bake the final object in an elegant way suggested
> by Boris.
> ---
> drivers/mtd/maps/Makefile | 10 ++++------
> drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} | 0
> 2 files changed, 4 insertions(+), 6 deletions(-)
> rename drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} (100%)
>
> diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
> index aef1846b4de2..5a09a72ab112 100644
> --- a/drivers/mtd/maps/Makefile
> +++ b/drivers/mtd/maps/Makefile
> @@ -17,12 +17,10 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o
> 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
> diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of_core.c
> similarity index 100%
> rename from drivers/mtd/maps/physmap_of.c
> rename to drivers/mtd/maps/physmap_of_core.c
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3] mtd: physmap_of: really fix the physmap add-ons
2017-03-31 8:04 ` Boris Brezillon
@ 2017-04-19 20:07 ` Brian Norris
-1 siblings, 0 replies; 6+ messages in thread
From: Brian Norris @ 2017-04-19 20:07 UTC (permalink / raw)
To: Boris Brezillon
Cc: Linus Walleij, David Woodhouse, Marek Vasut, Richard Weinberger,
Cyrille Pitchen, linux-mtd, linux-arm-kernel
On Fri, Mar 31, 2017 at 10:04:51AM +0200, Boris Brezillon wrote:
> On Thu, 30 Mar 2017 17:36:39 +0200
> Linus Walleij <linus.walleij@linaro.org> wrote:
>
> > 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.
> >
> > Suggested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> > Fixes: 4f04f68e1598 ("mtd: physmap_of: fixup gemini/versatile dependencies")
> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>
> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Applied
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3] mtd: physmap_of: really fix the physmap add-ons
@ 2017-04-19 20:07 ` Brian Norris
0 siblings, 0 replies; 6+ messages in thread
From: Brian Norris @ 2017-04-19 20:07 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Mar 31, 2017 at 10:04:51AM +0200, Boris Brezillon wrote:
> On Thu, 30 Mar 2017 17:36:39 +0200
> Linus Walleij <linus.walleij@linaro.org> wrote:
>
> > 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.
> >
> > Suggested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> > Fixes: 4f04f68e1598 ("mtd: physmap_of: fixup gemini/versatile dependencies")
> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>
> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Applied
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-04-19 20:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-30 15:36 [PATCH v3] mtd: physmap_of: really fix the physmap add-ons Linus Walleij
2017-03-30 15:36 ` Linus Walleij
2017-03-31 8:04 ` Boris Brezillon
2017-03-31 8:04 ` Boris Brezillon
2017-04-19 20:07 ` Brian Norris
2017-04-19 20:07 ` Brian Norris
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.