On Fri, Apr 03, 2020 at 10:39:36PM -0700, Guenter Roeck wrote: > On Fri, Mar 13, 2020 at 07:42:36PM +0000, Tudor.Ambarus@xxxxxxxxxxxxx wrote: > > From: Boris Brezillon <bbrezillon@xxxxxxxxxx> > > > > Move all SPI NOR controller drivers to a controllers/ sub-directory > > so that we only have SPI NOR related source files under > > drivers/mtd/spi-nor/. > > > > Rename spi-nor.c into core.c, we are about to split this file in multiple > > source files (one per manufacturer, plus one for the SFDP parsing logic). > > > > Signed-off-by: Boris Brezillon <bbrezillon@xxxxxxxxxx> > > Signed-off-by: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx> > > Reviewed-by: Vignesh Raghavendra <vigneshr@xxxxxx> > > I have no idea why, but with this patch in the upstream kernel I can no longer > boot aspeed systems from flash with qemu. > Ah yes, it does help to actually build the moved files. The following diff makes it work again. 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/ Guenter > Guenter > > --- > bisect log: > > # bad: [bef7b2a7be28638770972ab2709adf11d601c11a] Merge tag 'devicetree-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux > # good: [ac438771ccb4479528594c7e19f2c39cf1814a86] Merge branch 'for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu > git bisect start 'bef7b2a7be28' 'ac438771ccb4' > # good: [848960e576dafc8ed54c691b2f70b92e1fdea9ba] Merge tag 'sound-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound > git bisect good 848960e576dafc8ed54c691b2f70b92e1fdea9ba > # bad: [e109f506074152b7241bcbd3949a099e776cb802] Merge tag 'mtd/for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux > git bisect bad e109f506074152b7241bcbd3949a099e776cb802 > # good: [e964f1e04a1ce562f0d748b29326244d3cb35ba4] Merge tag 'dmaengine-5.7-rc1' of git://git.infradead.org/users/vkoul/slave-dma > git bisect good e964f1e04a1ce562f0d748b29326244d3cb35ba4 > # good: [798fcdd010006e87b3154d6454c657af7b033002] mtd: spinand: toshiba: Support for new Kioxia Serial NAND > git bisect good 798fcdd010006e87b3154d6454c657af7b033002 > # bad: [2d47cac1eee76a75c28886c15f82323eb0ec0eb5] mtd: spi-nor: Move Xilinx bits out of core.c > git bisect bad 2d47cac1eee76a75c28886c15f82323eb0ec0eb5 > # bad: [f7242bfc02b8f8cb820eb32d726c11e7f337e942] mtd: spi-nor: Move Atmel bits out of core.c > git bisect bad f7242bfc02b8f8cb820eb32d726c11e7f337e942 > # good: [69228a0224c533c35b62b88a79aa96768ba29d5e] Merge tag 'mtk-mtd-spi-move' into spi-nor/next > git bisect good 69228a0224c533c35b62b88a79aa96768ba29d5e > # bad: [a0900d0195d2dcce464f4109445a788d5860b970] mtd: spi-nor: Prepare core / manufacturer code split > git bisect bad a0900d0195d2dcce464f4109445a788d5860b970 > # good: [81924dae51941018afdaf25638da804be4807ce5] mtd: spi-nor: Emphasise which is the generic set_4byte_addr_mode() method > git bisect good 81924dae51941018afdaf25638da804be4807ce5 > # first bad commit: [a0900d0195d2dcce464f4109445a788d5860b970] mtd: spi-nor: Prepare core / manufacturer code split ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/