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

Message ID	1435072645-3212-1-git-send-email-jteki@openedev.com
State	Changes Requested
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Jagan Teki <jteki@openedev.com> To: Tom Rini <trini@konsulko.com> Date: Tue, 23 Jun 2015 20:47:25 +0530 Message-Id: <1435072645-3212-1-git-send-email-jteki@openedev.com> Cc: u-boot@lists.denx.de Subject: [U-Boot] Pull request: u-boot-spi/master Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Jagan Teki June 23, 2015, 3:17 p.m. UTC

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)

----------------------------------------------------------------
Daniel Schwierzeck (1):
      mtd, spi: Add MTD layer driver

Haikun Wang (1):
      arm: ls102xa: Enable Driver Model SPI for ls1021atwr

Haikun.Wang@freescale.com (3):
      dm: sf: Add Atmel DataFlash spi flash driver
      arm: dts: s1021a-qds: Update dspiflash compatible to use "spi_dataflash"
      arm: ls102xa: Enable Driver Model SPI for ls1021aqds

Heiko Schocher (3):
      mtd, nand: Move common functions from cmd_nand.c to common place
      spi, sf: Use offset and size in sf cmd from mtdpartition
      mtd, spi: Check if flash pointer is used

 README                         |   9 +
 arch/arm/dts/ls1021a-qds.dts   |   2 +-
 common/cmd_nand.c              | 148 ++-------
 common/cmd_onenand.c           |  19 +-
 common/cmd_sf.c                |  61 ++--
 common/cmd_test.c              |  12 +-
 drivers/mtd/Makefile           |   4 +-
 drivers/mtd/mtd_uboot.c        |  99 ++++++
 drivers/mtd/spi/Makefile       |   2 +
 drivers/mtd/spi/sf_dataflash.c | 711 +++++++++++++++++++++++++++++++++++++++++
 drivers/mtd/spi/sf_internal.h  |   5 +
 drivers/mtd/spi/sf_mtd.c       | 104 ++++++
 drivers/mtd/spi/sf_probe.c     |  11 +-
 include/configs/ls1021aqds.h   |  13 +-
 include/configs/ls1021atwr.h   |  10 +-
 include/linux/mtd/mtd.h        |   5 +
 include/vsprintf.h             |   2 +
 lib/vsprintf.c                 |  16 +
 18 files changed, 1055 insertions(+), 178 deletions(-)
 create mode 100644 drivers/mtd/mtd_uboot.c
 create mode 100644 drivers/mtd/spi/sf_dataflash.c
 create mode 100644 drivers/mtd/spi/sf_mtd.c

Tom Rini June 24, 2015, 11:31 p.m. UTC | #1

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.

Heiko Schocher June 25, 2015, 3:58 a.m. UTC | #2

Hello Tom,

Am 25.06.2015 um 01:31 schrieb Tom Rini:
> 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.

Could you provide a log?

I see, based on current mainline:
commit 325849ff3d4adeebb8f8f9bc5db950724df9bc21
Merge: 8c65a2f de45149
Author: Tom Rini <trini@konsulko.com>
Date:   Fri Jun 19 14:21:32 2015 -0400

     Merge git://git.denx.de/u-boot-usb

pollux:u-boot hs [20150527] $ make mrproper
   CLEAN   examples/standalone
   CLEAN   tools
   CLEAN   tools/lib tools/common
   CLEAN   include/bmp_logo.h include/bmp_logo_data.h u-boot.lds u-boot.bin u-boot.srec u-boot.map 
u-boot.cfg u-boot System.map
   CLEAN   scripts/basic
   CLEAN   scripts/kconfig
   CLEAN   include/config include/generated
   CLEAN   .config include/autoconf.mk.dep include/autoconf.mk include/config.h
pollux:u-boot hs [20150527] $ make ls1021atwr_qspi_defconfig
   HOSTCC  scripts/basic/fixdep
   HOSTCC  scripts/kconfig/conf.o
   SHIPPED scripts/kconfig/zconf.tab.c
   SHIPPED scripts/kconfig/zconf.lex.c
   SHIPPED scripts/kconfig/zconf.hash.c
   HOSTCC  scripts/kconfig/zconf.tab.o
   HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
pollux:u-boot hs [20150527] $ make -s all
pollux:u-boot hs [20150527] $ make mrproper
m  CLEAN   examples/standalone
a  CLEAN   tools
k  CLEAN   tools/lib tools/common
   CLEAN   include/bmp_logo.h include/bmp_logo_data.h u-boot.lds u-boot.bin u-boot.srec u-boot.map 
u-boot.cfg u-boot System.map
e ls1021aqds_qspi_  CLEAN   scripts/basic
   CLEAN   scripts/kconfig
   CLEAN   include/config include/generated
d  CLEAN   .config include/autoconf.mk.dep include/autoconf.mk include/config.h
pollux:u-boot hs [20150527] $ make ls1021aqds_qspi_defconfig
   HOSTCC  scripts/basic/fixdep
   HOSTCC  scripts/kconfig/conf.o
   SHIPPED scripts/kconfig/zconf.tab.c
   SHIPPED scripts/kconfig/zconf.lex.c
   SHIPPED scripts/kconfig/zconf.hash.c
   HOSTCC  scripts/kconfig/zconf.tab.o
   HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
pollux:u-boot hs [20150527] $ make -s all
pollux:u-boot hs [20150527] $

Thanks!

bye,
Heiko

>
>
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

Jagan Teki June 25, 2015, 5:31 a.m. UTC | #3

On 25 June 2015 at 05:01, Tom Rini <trini@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.

thanks!

Tom Rini June 25, 2015, 11:36 a.m. UTC | #4

On Thu, Jun 25, 2015 at 11:01:44AM +0530, Jagan Teki wrote:
> On 25 June 2015 at 05:01, Tom Rini <trini@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.

Jagan Teki June 25, 2015, 1:26 p.m. UTC | #5

On 25 June 2015 at 17:06, Tom Rini <trini@konsulko.com> wrote:
> On Thu, Jun 25, 2015 at 11:01:44AM +0530, Jagan Teki wrote:
>> On 25 June 2015 at 05:01, Tom Rini <trini@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.

Looks like some other dependencies about CONFIG_DM, let me look at it.
and will come back.

thanks!

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

Pull-request

Message

Comments