mbox

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

Message ID 1458025880-24244-1-git-send-email-jteki@openedev.com
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-spi.git master

Message

Jagan Teki March 15, 2016, 7:11 a.m. UTC
Hi Tom,

Please pull this PR.

thanks!
Jagan.

The following changes since commit df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa:

  Prepare v2016.03 (2016-03-14 10:20:21 -0400)

are available in the git repository at:

  git://git.denx.de/u-boot-spi.git master

for you to fetch changes up to 77b8d04854f486741471ad02b93b473b5b3d72f8:

  spi: omap3: Convert to driver model (2016-03-14 22:46:28 +0530)

----------------------------------------------------------------
Jagan Teki (3):
      spi: omap3: Move headers code inside the driver
      spi: omap3: Make local functions as static
      spi: omap3: Convert to driver model

 drivers/spi/Kconfig     |   7 +
 drivers/spi/omap3_spi.c | 757 +++++++++++++++++++++++++++++++-----------------
 drivers/spi/omap3_spi.h | 109 -------
 3 files changed, 497 insertions(+), 376 deletions(-)
 delete mode 100644 drivers/spi/omap3_spi.h

Comments

Tom Rini March 15, 2016, 12:01 p.m. UTC | #1
On Tue, Mar 15, 2016 at 12:41:20PM +0530, Jagan Teki wrote:

> Hi Tom,
> 
> Please pull this PR.
> 
> thanks!
> Jagan.
> 
> The following changes since commit df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa:
> 
>   Prepare v2016.03 (2016-03-14 10:20:21 -0400)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-spi.git master
> 
> for you to fetch changes up to 77b8d04854f486741471ad02b93b473b5b3d72f8:
> 
>   spi: omap3: Convert to driver model (2016-03-14 22:46:28 +0530)
> 

Applied to u-boot/master, thanks!
Tom Rini March 15, 2016, 3:04 p.m. UTC | #2
On Tue, Mar 15, 2016 at 08:01:14AM -0400, Tom Rini wrote:
> On Tue, Mar 15, 2016 at 12:41:20PM +0530, Jagan Teki wrote:
> 
> > Hi Tom,
> > 
> > Please pull this PR.
> > 
> > thanks!
> > Jagan.
> > 
> > The following changes since commit df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa:
> > 
> >   Prepare v2016.03 (2016-03-14 10:20:21 -0400)
> > 
> > are available in the git repository at:
> > 
> >   git://git.denx.de/u-boot-spi.git master
> > 
> > for you to fetch changes up to 77b8d04854f486741471ad02b93b473b5b3d72f8:
> > 
> >   spi: omap3: Convert to driver model (2016-03-14 22:46:28 +0530)
> > 
> 
> Applied to u-boot/master, thanks!

But, bah!

+(cm_t3517,cm_t35) drivers/spi/built-in.o:(.bss.priv+0x0): multiple definition of `priv'
+(cm_t3517,cm_t35) drivers/built-in.o:(.bss.priv+0x0): first defined here
+(cm_t3517,cm_t35) arm-linux-gnueabi-ld.bfd: Warning: size of symbol `priv' changed from 20 in drivers/built-in.o to 4 in drivers/spi/built-in.o
+(cm_t3517,cm_t35) make[1]: *** [u-boot] Error 1
+(cm_t3517,cm_t35) make: *** [sub-make] Error 2
Jagan Teki March 15, 2016, 5:51 p.m. UTC | #3
On 15 March 2016 at 20:34, Tom Rini <trini@konsulko.com> wrote:
> On Tue, Mar 15, 2016 at 08:01:14AM -0400, Tom Rini wrote:
>> On Tue, Mar 15, 2016 at 12:41:20PM +0530, Jagan Teki wrote:
>>
>> > Hi Tom,
>> >
>> > Please pull this PR.
>> >
>> > thanks!
>> > Jagan.
>> >
>> > The following changes since commit df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa:
>> >
>> >   Prepare v2016.03 (2016-03-14 10:20:21 -0400)
>> >
>> > are available in the git repository at:
>> >
>> >   git://git.denx.de/u-boot-spi.git master
>> >
>> > for you to fetch changes up to 77b8d04854f486741471ad02b93b473b5b3d72f8:
>> >
>> >   spi: omap3: Convert to driver model (2016-03-14 22:46:28 +0530)
>> >
>>
>> Applied to u-boot/master, thanks!
>
> But, bah!
>
> +(cm_t3517,cm_t35) drivers/spi/built-in.o:(.bss.priv+0x0): multiple definition of `priv'
> +(cm_t3517,cm_t35) drivers/built-in.o:(.bss.priv+0x0): first defined here
> +(cm_t3517,cm_t35) arm-linux-gnueabi-ld.bfd: Warning: size of symbol `priv' changed from 20 in drivers/built-in.o to 4 in drivers/spi/built-in.o
> +(cm_t3517,cm_t35) make[1]: *** [u-boot] Error 1
> +(cm_t3517,cm_t35) make: *** [sub-make] Error 2
>

Ohh, yes look like an issue with global priv on non-dm stuff, will send the fix.

thanks!