Pull request: u-boot-arm/master

U-Boot Applied Albert ARIBAUD 6 participants 8 messages May 11, 2011 – May 14, 2011

lore

Share & tools

lore

Albert ARIBAUD

author

2011-05-11 21:07 UTC #0 lore raw

Hi Wolfgang,

The following changes since commit 264eaa0ea967bac32214b87d60cfc86c8b22cac6:

keymile boards: move keymile specific header in subdir (2011-05-10
23:22:49 +0200)

are available in the git repository at:
git://git.denx.de/u-boot-arm master

Ben Gardiner (1):
da850evm: fix NAND WSTROBE and TA timings

Clint Adams (4):
Rename openrd_base files to openrd
Add definitions for OpenRD-Client and OpenRD-Ultimate Initialize second PHY on OpenRD-Client and OpenRD-Ultimate Enable multiple fs options for Marvell SoC family on OpenRD boards

Fabio Estevam (2):
MX31: mx31pdk: Add watchdog support
gpio: imx: Fix return value on error

Simon Guinot (2):
Kirkwood: allow to override CONFIG_SYS_TCLK mv-common.h: fix DRAM banks configuration

Stefano Babic (2):
MX31: removed warning due to missing prototype
MX31: change return value of get_cpu_rev

  MAKEALL                                            |    2 +
  arch/arm/cpu/arm1136/mx31/generic.c                |   31 
+++++++++++--------
  arch/arm/include/asm/arch-kirkwood/kw88f6281.h     |    8 +++--
  arch/arm/include/asm/arch-mx31/clock.h             |    1 +
  arch/arm/include/asm/arch-mx31/imx-regs.h          |    2 +-
  board/Marvell/{openrd_base => openrd}/Makefile     |    2 +-
  board/Marvell/{openrd_base => openrd}/kwbimage.cfg |    0
  .../{openrd_base/openrd_base.c => openrd/openrd.c} |   33 
+++++++++++++++++---
  .../{openrd_base/openrd_base.h => openrd/openrd.h} |    0
  board/davinci/da8xxevm/da850evm.c                  |    4 +-
  board/freescale/mx31pdk/mx31pdk.c                  |   16 +++++++++
  boards.cfg                                         |    4 ++-
  drivers/gpio/mxc_gpio.c                            |    5 ++-
  include/configs/mv-common.h                        |    8 ++--
  include/configs/mx31pdk.h                          |    3 ++
  include/configs/{openrd_base.h => openrd.h}        |   33 
+++++++++++++++++---
  16 files changed, 115 insertions(+), 37 deletions(-)

rename board/Marvell/{openrd_base => openrd}/Makefile (98%) rename board/Marvell/{openrd_base => openrd}/kwbimage.cfg (100%) rename board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c} (80%) rename board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h} (100%) rename include/configs/{openrd_base.h => openrd.h} (81%)

Amicalement,

Signature · 1 line

Albert.

Rogan Dawes

2011-05-11 22:11 UTC #1 lore raw

Quoted 2 lines · Albert ARIBAUD

Simon Guinot (2):
mv-common.h: fix DRAM banks configuration

I think Prafulla already accepted my own change to fix this. Not sure which one is considered better.

I had not actually intended mine for merging (no sign off), and had simply posted the patch as part of my DNS323 series. However, Prafulla saw it and merged it some time ago.

Regards,

Rogan

Albert ARIBAUD

author

2011-05-12 05:41 UTC #2 lore raw

Hi Rogan,

Le 12/05/2011 00:11, Rogan Dawes a ?crit :

Quoted 6 lines · Albert ARIBAUD

Quoted 2 lines
Simon Guinot (2):
mv-common.h: fix DRAM banks configuration
I think Prafulla already accepted my own change to fix this. Not sure which one is considered better.

Both your and Simon's changes would come from Prafulla's Marvell tree actually.

Prafulla, can you comment?

Amicalement,

Signature · 1 line

Albert.

Prafulla Wadaskar

2011-05-12 08:48 UTC #3 lore raw

Quoted 9 lines

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
Sent: Thursday, May 12, 2011 11:11 AM
To: Rogan Dawes
Cc: Wolfgang Denk; u-boot at lists.denx.de; Prafulla Wadaskar
Subject: Re: Pull request: u-boot-arm/master

Quoted 9 lines

Hi Rogan,
Le 12/05/2011 00:11, Rogan Dawes a ?crit :
Quoted 6 lines · Albert ARIBAUD
Quoted 2 lines
Simon Guinot (2):
mv-common.h: fix DRAM banks configuration
I think Prafulla already accepted my own change to fix this. Not sure which one is considered better.

Yes, This patch is accepted and applied to u-boot-marvell.git, the same is pulled on u-boot-arm.git too.

Quoted 5 lines

Both your and Simon's changes would come from Prafulla's Marvell tree actually.
Prafulla, can you comment?

Hi Simon
You may rebase your development and send new patch series excluding applied patches and considering review comments so far.

Regards..
Prafulla . .

Simon Guinot

2011-05-12 09:06 UTC #4 lore raw

Hi Prafulla,

Quoted 22 lines · Prafulla Wadaskar

Quoted 9 lines
-----Original Message-----
From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
Sent: Thursday, May 12, 2011 11:11 AM
To: Rogan Dawes
Cc: Wolfgang Denk; u-boot at lists.denx.de; Prafulla Wadaskar
Subject: Re: Pull request: u-boot-arm/master
Quoted 9 lines
Hi Rogan,
Le 12/05/2011 00:11, Rogan Dawes a ?crit :
Quoted 6 lines · Albert ARIBAUD
Quoted 2 lines
Simon Guinot (2):
mv-common.h: fix DRAM banks configuration
I think Prafulla already accepted my own change to fix this. Not sure which one is considered better.
Yes, This patch is accepted and applied to u-boot-marvell.git, the same is pulled on u-boot-arm.git too.
Quoted 1 line

Quoted 7 lines

Quoted 4 lines
Both your and Simon's changes would come from Prafulla's Marvell tree actually.
Prafulla, can you comment?
Hi Simon
You may rebase your development and send new patch series excluding applied patches and considering review comments so far.

IMHO, the v6 series is in a good shape. All the review comments have been addressed and all the accepted patches have been dropped. Moreover, the merge with current u-boot-{arm,marvell} git tree is rather trivial.

Anyway, I will post again my last stagged two patches.

Regards,

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110512/b088cf4c/attachment.pgp

Simon Guinot

2011-05-12 09:12 UTC #5 lore raw

In reply to Rogan Dawes

Hi Rogan,

Quoted 6 lines · Rogan Dawes

Quoted 2 lines · Albert ARIBAUD
Simon Guinot (2):
mv-common.h: fix DRAM banks configuration
I think Prafulla already accepted my own change to fix this. Not sure which one is considered better.

The two patches are addressing different issues (DRAM configuration against detection). They are needed both.

Regards,

Wolfgang Denk

Applied

2011-05-12 17:27 UTC #6 lore raw

In reply to Albert ARIBAUD

Dear Albert ARIBAUD,

Quoted 51 lines · In message <[email protected]> you wrote:

Hi Wolfgang,
The following changes since commit 264eaa0ea967bac32214b87d60cfc86c8b22cac6:
keymile boards: move keymile specific header in subdir (2011-05-10
23:22:49 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-arm master
Ben Gardiner (1):
da850evm: fix NAND WSTROBE and TA timings
Clint Adams (4):
Rename openrd_base files to openrd
Add definitions for OpenRD-Client and OpenRD-Ultimate Initialize second PHY on OpenRD-Client and OpenRD-Ultimate Enable multiple fs options for Marvell SoC family on OpenRD boards
Fabio Estevam (2):
MX31: mx31pdk: Add watchdog support
gpio: imx: Fix return value on error
Simon Guinot (2):
Kirkwood: allow to override CONFIG_SYS_TCLK mv-common.h: fix DRAM banks configuration
Stefano Babic (2):
MX31: removed warning due to missing prototype
MX31: change return value of get_cpu_rev
  MAKEALL                                            |    2 +
  arch/arm/cpu/arm1136/mx31/generic.c                |   31 
+++++++++++--------
  arch/arm/include/asm/arch-kirkwood/kw88f6281.h     |    8 +++--
  arch/arm/include/asm/arch-mx31/clock.h             |    1 +
  arch/arm/include/asm/arch-mx31/imx-regs.h          |    2 +-
  board/Marvell/{openrd_base => openrd}/Makefile     |    2 +-
  board/Marvell/{openrd_base => openrd}/kwbimage.cfg |    0
  .../{openrd_base/openrd_base.c => openrd/openrd.c} |   33 
+++++++++++++++++---
  .../{openrd_base/openrd_base.h => openrd/openrd.h} |    0
  board/davinci/da8xxevm/da850evm.c                  |    4 +-
  board/freescale/mx31pdk/mx31pdk.c                  |   16 +++++++++
  boards.cfg                                         |    4 ++-
  drivers/gpio/mxc_gpio.c                            |    5 ++-
  include/configs/mv-common.h                        |    8 ++--
  include/configs/mx31pdk.h                          |    3 ++
  include/configs/{openrd_base.h => openrd.h}        |   33 
+++++++++++++++++---
  16 files changed, 115 insertions(+), 37 deletions(-)

Quoted 5 lines

rename board/Marvell/{openrd_base => openrd}/Makefile (98%) rename board/Marvell/{openrd_base => openrd}/kwbimage.cfg (100%) rename board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c} (80%) rename board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h} (100%) rename include/configs/{openrd_base.h => openrd.h} (81%)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 7 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A student of  probability  soon  realizes  that  by  its  nature  the
billion-to-one  chance  crops  up nine times out of ten, and that the
greatest odds boil down to a double-sided statement: it will  happen,
or it will not.         - Terry Pratchett, _The Dark Side of the Sun_

Dirk Behme

2011-05-14 18:38 UTC #7 lore raw

Quoted 12 lines · Wolfgang Denk

Dear Albert ARIBAUD,
Quoted 9 lines · In message<[email protected]> you wrote:
Hi Wolfgang,
The following changes since commit 264eaa0ea967bac32214b87d60cfc86c8b22cac6:
keymile boards: move keymile specific header in subdir (2011-05-10
23:22:49 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-arm master

...

Quoted 2 lines

Applied, thanks.

Doing a ./MAKEALL ARMV7 on the recent git head (91081e01b10d64e99dc485e477e6ae3b1171e8ce Revert "Fix building tools alone with host compiler") I get the following errors/warnings. I've done a quick scan of the available patches at the mailing list and tried to add the available uncommitted fixes. Anybody likes apply them or send patches where I haven't found any?

omap3_beagle:
beagle.c: In function 'misc_init_r':
beagle.c:174: warning: initialization from incompatible pointer type Most probably introduced with:
http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commit;h=d4e53f063dd25e071444b87303573e7440deeb89
Fix:
http://lists.denx.de/pipermail/u-boot/2011-April/091030.html

omap3_beagle:
omap3_overo:
igep0030:
igep0020:
omap_hsmmc.c: In function 'omap_mmc_init':
omap_hsmmc.c:474: warning: implicit declaration of function 'get_cpu_family'
omap_hsmmc.c:474: warning: implicit declaration of function 'get_cpu_rev' Most probably introduced with:
http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commit;h=4ca9244d74f146a0605f5bee28a66e39aae88d3e
Fix: ? (-> fix missing function prototype)

s5p_goni:

s5p_mmc.c: In function 's5p_mmc_initialize':

s5p_mmc.c:469: error: 'struct mmc' has no member named 'm_bmax' Most probably introduced with:
http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commit;h=8feafcc49c0b7a9c541904f95a43dbef2fecc38b
Fix: ? (-> fix typo)

a9x4_ct_vxp:
ca9x4_ct_vxp.c: In function 'cpu_mmc_init':
ca9x4_ct_vxp.c:93: warning: implicit declaration of function 'arm_pl180_mmci_init'
Most probably introduced with:
http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff;h=f0c64526b7e51ba997a0f1baf9e74e6d497b957e
Fix: ? (-> fix missing function prototype)

mx51evk:
In file included from include/config.h:6,
from include/common.h:37:

include/configs/mx51evk.h:229:1: warning: "CONFIG_OF_LIBFDT" redefined include/configs/mx51evk.h:51:1: warning: this is the location of the previous definition
Most probably introduced with:
http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff;h=dcd441c32560a823019c720fb034ff425efbc376
http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff;h=2fa8ca98c37d5b1bb0328b19ddb7e9d162cd9683
Fix:
http://patchwork.ozlabs.org/patch/93978/

Many thanks

Dirk