[U-Boot] Pull request: u-boot-spi/master

[Tom Rini]

On Thu, Jun 25, 2015 at 11:01:44AM +0530, Jagan Teki wrote:
> On 25 June 2015 at 05:01, Tom Rini <trini at konsulko.com> wrote:
> > On Tue, Jun 23, 2015 at 08:47:25PM +0530, Jagan Teki wrote:
> >
> >> Hi Tom,
> >>
> >> Please pull this request, few importent feature list on spi-flash front
> >> like data flash and spi flash MTD supports.
> >>
> >> thanks!
> >> Jagan.
> >>
> >> The following changes since commit c6265f7f3410b5e5763181cdd123a3f6fcd9fd58:
> >>
> >>   CPCI4052: Remove CONFIG_SYS_LONGHELP (2015-06-18 16:19:00 -0400)
> >>
> >> are available in the git repository at:
> >>
> >>   git://git.denx.de/u-boot-spi.git master
> >>
> >> for you to fetch changes up to 1070bf38a5c92c8d1a77b26380988957890ba6de:
> >>
> >>   mtd, spi: Check if flash pointer is used (2015-06-23 01:13:23 +0530)
> >>
> >
> > This introduces build problems on ls1021atwr_qspi and ls1021aqds_qspi.
> 
> Don't know what it causes, I applied manually all 8 patches on master
> and I couldn't
> see any issues.

Same for both:
       arm:  +   ls1021atwr_qspi
+(ls1021atwr_qspi) drivers/mtd/spi/sf_probe.c: In function 'spi_flash_std_probe':
+(ls1021atwr_qspi) drivers/mtd/spi/sf_probe.c:480:54: error: dereferencing pointer to i
ncomplete type
+(ls1021atwr_qspi)   debug("%s: slave=%p, cs=%d\n", __func__, slave, plat->cs);
+(ls1021atwr_qspi)                                                       ^
+(ls1021atwr_qspi) include/common.h:109:26: note: in definition of macro 'debug_cond'
+(ls1021atwr_qspi)     printf(pr_fmt(fmt), ##args); \
+(ls1021atwr_qspi)                           ^
+(ls1021atwr_qspi) drivers/mtd/spi/sf_probe.c:480:2: note: in expansion of macro 'debug
'
+(ls1021atwr_qspi)   ^
+(ls1021atwr_qspi) drivers/mtd/spi/sf-uclass.c: In function 'spi_flash_free':
+(ls1021atwr_qspi) drivers/mtd/spi/sf-uclass.c:47:29: error: 'struct spi_slave' has no member named 'dev'
+(ls1021atwr_qspi)   spi_flash_remove(flash->spi->dev);
+(ls1021atwr_qspi)                              ^
+(ls1021atwr_qspi)   ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode,
+(ls1021atwr_qspi) drivers/mtd/spi/sf-uclass.c:66:15: error: 'struct spi_slave' has no member named 'dev'
+(ls1021atwr_qspi)   *devp = slave->dev;
+(ls1021atwr_qspi)                ^
+(ls1021atwr_qspi) make[2]: *** [drivers/mtd/spi/sf_probe.o] Error 1
+(ls1021atwr_qspi) make[2]: *** [drivers/mtd/spi/sf-uclass.o] Error 1
+(ls1021atwr_qspi) make[1]: *** [drivers/mtd/spi] Error 2
+(ls1021atwr_qspi)   ret = spi_find_bus_and_cs(bus, cs, &bus_dev, &new);
+(ls1021atwr_qspi) make: *** [sub-make] Error 2
w+(ls1021atwr_qspi) drivers/mtd/spi/sf-uclass.c: In function 'spi_flash_probe_bus_cs':
w+(ls1021atwr_qspi) drivers/mtd/spi/sf-uclass.c:61:2: warning: implicit declaration of function 'spi_get_bus_and_cs' [-Wimplicit-function-declaration]
w+(ls1021atwr_qspi) common/cmd_sf.c: In function 'do_spi_flash_probe':
w+(ls1021atwr_qspi) common/cmd_sf.c:123:2: warning: implicit declaration of function 'spi_find_bus_and_cs' [-Wimplicit-function-declaration]

Because CONFIG_DM is not set, and before the SPI patches this is fine but
now it's causing this failure.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150625/21169900/attachment.sig>