linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mtd: nand: omap2: Rename shippable module to omap2_nand
@ 2015-08-21 10:45 Roger Quadros
  2015-09-02 21:06 ` Brian Norris
  0 siblings, 1 reply; 3+ messages in thread
From: Roger Quadros @ 2015-08-21 10:45 UTC (permalink / raw)
  To: computersforpeace, dwmw2
  Cc: ezequiel, tony, linux-mtd, linux-kernel, linux-omap,
	Roger Quadros, Robert Nelson

As both omap2 onenand and omap2 nand driver modules are
named the same i.e. "omap2.ko", only one of them gets shipped
during MODPOST if both are configured as loadable modules.

To avoid this ambiguity let's ship the omap2 nand
driver as "omap2_nand.ko"

Reported by Pierre Neyron via github
https://github.com/beagleboard/linux/issues/40

Cc: Robert Nelson <robertcnelson@gmail.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 drivers/mtd/nand/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 1f897ec..075a027 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -26,7 +26,8 @@ obj-$(CONFIG_MTD_NAND_CS553X)		+= cs553x_nand.o
 obj-$(CONFIG_MTD_NAND_NDFC)		+= ndfc.o
 obj-$(CONFIG_MTD_NAND_ATMEL)		+= atmel_nand.o
 obj-$(CONFIG_MTD_NAND_GPIO)		+= gpio.o
-obj-$(CONFIG_MTD_NAND_OMAP2) 		+= omap2.o
+omap2_nand-objs := omap2.o
+obj-$(CONFIG_MTD_NAND_OMAP2) 		+= omap2_nand.o
 obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD)	+= omap_elm.o
 obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx270_nand.o
 obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] mtd: nand: omap2: Rename shippable module to omap2_nand
  2015-08-21 10:45 [PATCH] mtd: nand: omap2: Rename shippable module to omap2_nand Roger Quadros
@ 2015-09-02 21:06 ` Brian Norris
  2015-09-03  7:41   ` Roger Quadros
  0 siblings, 1 reply; 3+ messages in thread
From: Brian Norris @ 2015-09-02 21:06 UTC (permalink / raw)
  To: Roger Quadros
  Cc: dwmw2, ezequiel, tony, linux-mtd, linux-kernel, linux-omap,
	Robert Nelson

On Fri, Aug 21, 2015 at 01:45:35PM +0300, Roger Quadros wrote:
> As both omap2 onenand and omap2 nand driver modules are
> named the same i.e. "omap2.ko", only one of them gets shipped
> during MODPOST if both are configured as loadable modules.
> 
> To avoid this ambiguity let's ship the omap2 nand
> driver as "omap2_nand.ko"
> 
> Reported by Pierre Neyron via github
> https://github.com/beagleboard/linux/issues/40
> 
> Cc: Robert Nelson <robertcnelson@gmail.com>
> Signed-off-by: Roger Quadros <rogerq@ti.com>
> ---
>  drivers/mtd/nand/Makefile | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
> index 1f897ec..075a027 100644
> --- a/drivers/mtd/nand/Makefile
> +++ b/drivers/mtd/nand/Makefile
> @@ -26,7 +26,8 @@ obj-$(CONFIG_MTD_NAND_CS553X)		+= cs553x_nand.o
>  obj-$(CONFIG_MTD_NAND_NDFC)		+= ndfc.o
>  obj-$(CONFIG_MTD_NAND_ATMEL)		+= atmel_nand.o
>  obj-$(CONFIG_MTD_NAND_GPIO)		+= gpio.o
> -obj-$(CONFIG_MTD_NAND_OMAP2) 		+= omap2.o
> +omap2_nand-objs := omap2.o
> +obj-$(CONFIG_MTD_NAND_OMAP2) 		+= omap2_nand.o

Pushed to l2-mtd.git. I suppose this one should go out for 4.3, as
there's little downside to it, and it's kind of a bugfix.

Brian

>  obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD)	+= omap_elm.o
>  obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx270_nand.o
>  obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
> -- 
> 2.1.4
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mtd: nand: omap2: Rename shippable module to omap2_nand
  2015-09-02 21:06 ` Brian Norris
@ 2015-09-03  7:41   ` Roger Quadros
  0 siblings, 0 replies; 3+ messages in thread
From: Roger Quadros @ 2015-09-03  7:41 UTC (permalink / raw)
  To: Brian Norris
  Cc: dwmw2, ezequiel, tony, linux-mtd, linux-kernel, linux-omap,
	Robert Nelson

On 03/09/15 00:06, Brian Norris wrote:
> On Fri, Aug 21, 2015 at 01:45:35PM +0300, Roger Quadros wrote:
>> As both omap2 onenand and omap2 nand driver modules are
>> named the same i.e. "omap2.ko", only one of them gets shipped
>> during MODPOST if both are configured as loadable modules.
>>
>> To avoid this ambiguity let's ship the omap2 nand
>> driver as "omap2_nand.ko"
>>
>> Reported by Pierre Neyron via github
>> https://github.com/beagleboard/linux/issues/40
>>
>> Cc: Robert Nelson <robertcnelson@gmail.com>
>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>> ---
>>  drivers/mtd/nand/Makefile | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
>> index 1f897ec..075a027 100644
>> --- a/drivers/mtd/nand/Makefile
>> +++ b/drivers/mtd/nand/Makefile
>> @@ -26,7 +26,8 @@ obj-$(CONFIG_MTD_NAND_CS553X)		+= cs553x_nand.o
>>  obj-$(CONFIG_MTD_NAND_NDFC)		+= ndfc.o
>>  obj-$(CONFIG_MTD_NAND_ATMEL)		+= atmel_nand.o
>>  obj-$(CONFIG_MTD_NAND_GPIO)		+= gpio.o
>> -obj-$(CONFIG_MTD_NAND_OMAP2) 		+= omap2.o
>> +omap2_nand-objs := omap2.o
>> +obj-$(CONFIG_MTD_NAND_OMAP2) 		+= omap2_nand.o
> 
> Pushed to l2-mtd.git. I suppose this one should go out for 4.3, as
> there's little downside to it, and it's kind of a bugfix.

That is perfectly fine. Thanks.

cheers,
-roger

> 
>>  obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD)	+= omap_elm.o
>>  obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx270_nand.o
>>  obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
>> -- 
>> 2.1.4
>>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-09-03  7:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-21 10:45 [PATCH] mtd: nand: omap2: Rename shippable module to omap2_nand Roger Quadros
2015-09-02 21:06 ` Brian Norris
2015-09-03  7:41   ` Roger Quadros

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).