| Message ID | 20200404153631.103549-1-linux@roeck-us.net |
|---|---|
| State | Accepted |
| Delegated to: | Richard Weinberger |
| Headers | show |
| Series | mtd: spi-nor: Compile files in controllers/ directory | expand |
On Sat, 4 Apr 2020 08:36:31 -0700 Guenter Roeck <linux@roeck-us.net> 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 <bbrezillon@kernel.org> > Cc: Tudor Ambarus <tudor.ambarus@microchip.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> 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/
On Sat, 4 Apr 2020 at 15:37, Guenter Roeck <linux@roeck-us.net> 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 <bbrezillon@kernel.org> > Cc: Tudor Ambarus <tudor.ambarus@microchip.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> Thanks Guenter. I just discovered this too. Acked-by: Joel Stanley <joel@jms.id.au> > --- > 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 >
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 <bbrezillon@kernel.org> > Cc: Tudor Ambarus <tudor.ambarus@microchip.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/mtd/spi-nor/Makefile | 2 ++ > 1 file changed, 2 insertions(+) Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> I missed that somehow, sorry. Thank you for the fix, Guenter!
On Mon, Apr 6, 2020 at 7:31 AM <Tudor.Ambarus@microchip.com> 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 <bbrezillon@kernel.org> > > Cc: Tudor Ambarus <tudor.ambarus@microchip.com> > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > > --- > > drivers/mtd/spi-nor/Makefile | 2 ++ > > 1 file changed, 2 insertions(+) > > Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> > > I missed that somehow, sorry. Thank you for the fix, Guenter! Applied to mtd/fixes, thanks to everyone for addressing this.
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/
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 <bbrezillon@kernel.org> Cc: Tudor Ambarus <tudor.ambarus@microchip.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- drivers/mtd/spi-nor/Makefile | 2 ++ 1 file changed, 2 insertions(+)