2020-04-04 15:37:28

by Guenter Roeck

Subject: [PATCH] mtd: spi-nor: Compile files in controllers/ directory

Commit a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code
split") moved various files into a new directory, but did not add the new
directory to its parent directory Makefile. The moved files no longer
build, and affected flash chips no longer instantiate.

Adding the new directory to the parent directory Makefile fixes the
problem.

Fixes: a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code split")
Cc: Boris Brezillon <[email protected]>
Cc: Tudor Ambarus <[email protected]>
Signed-off-by: Guenter Roeck <[email protected]>
---
drivers/mtd/spi-nor/Makefile | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
index 7ddb742de1fe..653923896205 100644
--- a/drivers/mtd/spi-nor/Makefile
+++ b/drivers/mtd/spi-nor/Makefile
@@ -18,3 +18,5 @@ spi-nor-objs += winbond.o
spi-nor-objs += xilinx.o
spi-nor-objs += xmc.o
obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o
+
+obj-$(CONFIG_MTD_SPI_NOR) += controllers/
--
2.17.1

2020-04-04 15:41:18

by Boris Brezillon

Subject: Re: [PATCH] mtd: spi-nor: Compile files in controllers/ directory

On Sat, 4 Apr 2020 08:36:31 -0700
Guenter Roeck <[email protected]> wrote:

> Commit a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code
> split") moved various files into a new directory, but did not add the new
> directory to its parent directory Makefile. The moved files no longer
> build, and affected flash chips no longer instantiate.
>
> Adding the new directory to the parent directory Makefile fixes the
> problem.
>
> Fixes: a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code split")
> Cc: Boris Brezillon <[email protected]>
> Cc: Tudor Ambarus <[email protected]>
> Signed-off-by: Guenter Roeck <[email protected]>

Reviewed-by: Boris Brezillon <[email protected]>

Thanks for the fix, and my apologies for the regression.


> ---
> drivers/mtd/spi-nor/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
> index 7ddb742de1fe..653923896205 100644
> --- a/drivers/mtd/spi-nor/Makefile
> +++ b/drivers/mtd/spi-nor/Makefile
> @@ -18,3 +18,5 @@ spi-nor-objs += winbond.o
> spi-nor-objs += xilinx.o
> spi-nor-objs += xmc.o
> obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o
> +
> +obj-$(CONFIG_MTD_SPI_NOR) += controllers/

2020-04-06 01:22:04

by Joel Stanley

Subject: Re: [PATCH] mtd: spi-nor: Compile files in controllers/ directory

On Sat, 4 Apr 2020 at 15:37, Guenter Roeck <[email protected]> wrote:
>
> Commit a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code
> split") moved various files into a new directory, but did not add the new
> directory to its parent directory Makefile. The moved files no longer
> build, and affected flash chips no longer instantiate.
>
> Adding the new directory to the parent directory Makefile fixes the
> problem.
>
> Fixes: a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code split")
> Cc: Boris Brezillon <[email protected]>
> Cc: Tudor Ambarus <[email protected]>
> Signed-off-by: Guenter Roeck <[email protected]>

Thanks Guenter. I just discovered this too.

Acked-by: Joel Stanley <[email protected]>

> ---
> drivers/mtd/spi-nor/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
> index 7ddb742de1fe..653923896205 100644
> --- a/drivers/mtd/spi-nor/Makefile
> +++ b/drivers/mtd/spi-nor/Makefile
> @@ -18,3 +18,5 @@ spi-nor-objs += winbond.o
> spi-nor-objs += xilinx.o
> spi-nor-objs += xmc.o
> obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o
> +
> +obj-$(CONFIG_MTD_SPI_NOR) += controllers/
> --
> 2.17.1
>

2020-04-06 05:32:14

by Tudor Ambarus

Subject: Re: [PATCH] mtd: spi-nor: Compile files in controllers/ directory

On Saturday, April 4, 2020 6:36:31 PM EEST Guenter Roeck wrote:
> Commit a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code
> split") moved various files into a new directory, but did not add the new
> directory to its parent directory Makefile. The moved files no longer
> build, and affected flash chips no longer instantiate.
>
> Adding the new directory to the parent directory Makefile fixes the
> problem.
>
> Fixes: a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code split")
> Cc: Boris Brezillon <[email protected]>
> Cc: Tudor Ambarus <[email protected]>
> Signed-off-by: Guenter Roeck <[email protected]>
> ---
> drivers/mtd/spi-nor/Makefile | 2 ++
> 1 file changed, 2 insertions(+)

Reviewed-by: Tudor Ambarus <[email protected]>

I missed that somehow, sorry. Thank you for the fix, Guenter!

2020-04-09 20:07:18

by Richard Weinberger

Subject: Re: [PATCH] mtd: spi-nor: Compile files in controllers/ directory

On Mon, Apr 6, 2020 at 7:31 AM <[email protected]> wrote:
>
> On Saturday, April 4, 2020 6:36:31 PM EEST Guenter Roeck wrote:
> > Commit a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code
> > split") moved various files into a new directory, but did not add the new
> > directory to its parent directory Makefile. The moved files no longer
> > build, and affected flash chips no longer instantiate.
> >
> > Adding the new directory to the parent directory Makefile fixes the
> > problem.
> >
> > Fixes: a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code split")
> > Cc: Boris Brezillon <[email protected]>
> > Cc: Tudor Ambarus <[email protected]>
> > Signed-off-by: Guenter Roeck <[email protected]>
> > ---
> > drivers/mtd/spi-nor/Makefile | 2 ++
> > 1 file changed, 2 insertions(+)
>
> Reviewed-by: Tudor Ambarus <[email protected]>
>
> I missed that somehow, sorry. Thank you for the fix, Guenter!

Applied to mtd/fixes, thanks to everyone for addressing this.

--
Thanks,
//richard