[U-Boot] Pull request: u-boot-arm/master
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,
On 2011/05/11 11:07 PM, Albert ARIBAUD wrote:
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
Hi Rogan,
Le 12/05/2011 00:11, Rogan Dawes a écrit :
On 2011/05/11 11:07 PM, Albert ARIBAUD wrote:
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,
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: Thursday, May 12, 2011 11:11 AM To: Rogan Dawes Cc: Wolfgang Denk; u-boot@lists.denx.de; Prafulla Wadaskar Subject: Re: Pull request: u-boot-arm/master
Hi Rogan,
Le 12/05/2011 00:11, Rogan Dawes a écrit :
On 2011/05/11 11:07 PM, Albert ARIBAUD wrote:
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.
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 . .
Hi Prafulla,
On Thu, May 12, 2011 at 01:48:34AM -0700, Prafulla Wadaskar wrote:
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: Thursday, May 12, 2011 11:11 AM To: Rogan Dawes Cc: Wolfgang Denk; u-boot@lists.denx.de; Prafulla Wadaskar Subject: Re: Pull request: u-boot-arm/master
Hi Rogan,
Le 12/05/2011 00:11, Rogan Dawes a écrit :
On 2011/05/11 11:07 PM, Albert ARIBAUD wrote:
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.
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
Hi Rogan,
On Thu, May 12, 2011 at 12:11:41AM +0200, Rogan Dawes wrote:
On 2011/05/11 11:07 PM, Albert ARIBAUD wrote:
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,
Simon
Dear Albert ARIBAUD,
In message 4DCAFA98.2020205@aribaud.net 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(-) 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
On 12.05.2011 19:27, Wolfgang Denk wrote:
Dear Albert ARIBAUD,
In message4DCAFA98.2020205@aribaud.net you wrote:
Hi Wolfgang,
The following changes since commit 264eaa0ea967bac32214b87d60cfc86c8b22cac6:
keymile boards: move keymile specific header in subdir (2011-05-1023:22:49 +0200)
are available in the git repository at: git://git.denx.de/u-boot-arm master
...
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=d4e53f063dd25e... 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=4ca9244d74f146... 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=8feafcc49c0b7a... 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=f0c64526b7... 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=dcd441c325... http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff;h=2fa8ca98c3... Fix: http://patchwork.ozlabs.org/patch/93978/
Many thanks
Dirk
participants (6)
-
Albert ARIBAUD -
Dirk Behme -
Prafulla Wadaskar -
Rogan Dawes -
Simon Guinot -
Wolfgang Denk