| Message ID | 1316389174-31117-1-git-send-email-s-paulraj@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Sandeep, Le 19/09/2011 01:39, s-paulraj@ti.com a écrit : > Please pull u-boot-ti/next. > I checked all the patches for checkpatch errors. > Also all OMAP3 and OMAP4 built with no issues. > > Thanks, > Sandeep As this is your 'next' branch, there is an ambiguity: can you please indicate if you want me to pull this into my 'next' or 'master' branch? If on master, I assume you want me to also send out a pull request to Wolfgang, but I am not sure Wolfgang will allow it at this time. Amicalement,
Dear Albert ARIBAUD, In message <4E76EBFD.9060505@aribaud.net> you wrote: > > As this is your 'next' branch, there is an ambiguity: can you please > indicate if you want me to pull this into my 'next' or 'master' branch? > > If on master, I assume you want me to also send out a pull request to > Wolfgang, but I am not sure Wolfgang will allow it at this time. If I understand correctly this is mostly fixes, so I'd take it. Best regards, Wolfgang Denk
Hi Wofgang, Le 19/09/2011 09:47, Wolfgang Denk a écrit : > Dear Albert ARIBAUD, > > In message<4E76EBFD.9060505@aribaud.net> you wrote: >> >> As this is your 'next' branch, there is an ambiguity: can you please >> indicate if you want me to pull this into my 'next' or 'master' branch? >> >> If on master, I assume you want me to also send out a pull request to >> Wolfgang, but I am not sure Wolfgang will allow it at this time. > > If I understand correctly this is mostly fixes, so I'd take it. Sandeep's 'next' branch is based on my 'next', not on my 'master', hence my question -- there would have to be a rebase if Sandeep expected me to pull into my master. Sandeep, can you confirm what you want exactly? Meanwhile, I am launching regression builds on u-boot-ti/next, just in case. > Best regards, > > Wolfgang Denk Amicalement,
> > Hi Wofgang, > > Le 19/09/2011 09:47, Wolfgang Denk a écrit : > > Dear Albert ARIBAUD, > > > > In message<4E76EBFD.9060505@aribaud.net> you wrote: > >> > >> As this is your 'next' branch, there is an ambiguity: can you please > >> indicate if you want me to pull this into my 'next' or 'master' branch? > >> > >> If on master, I assume you want me to also send out a pull request to > >> Wolfgang, but I am not sure Wolfgang will allow it at this time. > > > > If I understand correctly this is mostly fixes, so I'd take it. > > Sandeep's 'next' branch is based on my 'next', not on my 'master', hence > my question -- there would have to be a rebase if Sandeep expected me to > pull into my master. > > Sandeep, can you confirm what you want exactly? Meanwhile, I am > launching regression builds on u-boot-ti/next, just in case. > Albert, The pull request if for your next branch. Thanks, Sandeep
Le 19/09/2011 16:21, Paulraj, Sandeep a écrit : > > >> >> Hi Wofgang, >> >> Le 19/09/2011 09:47, Wolfgang Denk a écrit : >>> Dear Albert ARIBAUD, >>> >>> In message<4E76EBFD.9060505@aribaud.net> you wrote: >>>> >>>> As this is your 'next' branch, there is an ambiguity: can you please >>>> indicate if you want me to pull this into my 'next' or 'master' branch? >>>> >>>> If on master, I assume you want me to also send out a pull request to >>>> Wolfgang, but I am not sure Wolfgang will allow it at this time. >>> >>> If I understand correctly this is mostly fixes, so I'd take it. >> >> Sandeep's 'next' branch is based on my 'next', not on my 'master', hence >> my question -- there would have to be a rebase if Sandeep expected me to >> pull into my master. >> >> Sandeep, can you confirm what you want exactly? Meanwhile, I am >> launching regression builds on u-boot-ti/next, just in case. >> > Albert, > > The pull request if for your next branch. Thanks a lot. There is a regression in u-boot-ti/next with respect to u-boot-arm/next, on board smdk6400, causing the following build failure: s3c64xx.c:80: error: static declaration of 'nand_read_buf' follows non-static declaration /home/uboot/src/u-boot-arm/include/nand.h:139: error: previous declaration of 'nand_read_buf' was here Git bisect finds commit 55f429bb39614a16b1bacc9a8bea9ac01a60bfc8 is the cause of the regression. Copying Simon as the author of the commit, in order to confirm that the issue is in smdk6400. If so, as MAINTAINERS has smdk marked orphaned and its former maintainer resigned, I take the ti/next branch in as it is, and if no one steps in as a maintainer for SMDK6400 before end of the 2011-12 releaése merge window, I will then apply a board removal patch for it. > Thanks, > Sandeep Amicalement,
Le 19/09/2011 01:39, s-paulraj@ti.com a écrit : > Please pull u-boot-ti/next. > I checked all the patches for checkpatch errors. > Also all OMAP3 and OMAP4 built with no issues. > > Thanks, > Sandeep > > The following changes since commit 3522ad62864669b335b85f5abcd136a84bbb7519: > Ajay Bhargav (1): > Armada100: Enable 88E3015 PHY support for GplugD > > are available in the git repository at: > > git://git.denx.de/u-boot-ti.git next > > Philip Balister (2): > OMAP3: Overo: Update GPMC timing for ethernet chip > overo: Set IEN on GPMC_CLK to support synchronous clocking. > > Sandeep Paulraj (1): > devkit8000: Fix build break > > Simon Schwarz (9): > omap-common/omap4: relocate early UART clock setup > omap3: Configure RAM bank 0 if in SPL > omap-common: add nand spl support > spl: add NAND Library to new SPL > spl: Add POWER library to new spl > omap3: new SPL structure support > devkit8000: Add nand-spl support for new SPL > omap3: implement boot parameter saving > omap-common: reorganize spl.c Applied to u-boot-arm/next (and then rebased above current u-boot/master), thanks! (reminder: this causes a regression in orphan board smdk6400. If no new board maintainer steps in and fixes it before 2011-12 release, the board will be removed) Amicalement,
On 09/20/2011 08:47 AM, Albert ARIBAUD wrote: [SNIP] > > There is a regression in u-boot-ti/next with respect to u-boot-arm/next, > on board smdk6400, causing the following build failure: > > s3c64xx.c:80: error: static declaration of 'nand_read_buf' follows > non-static declaration > /home/uboot/src/u-boot-arm/include/nand.h:139: error: previous > declaration of 'nand_read_buf' was here > > Git bisect finds commit 55f429bb39614a16b1bacc9a8bea9ac01a60bfc8 is the > cause of the regression. > > Copying Simon as the author of the commit, in order to confirm that the > issue is in smdk6400. > > If so, as MAINTAINERS has smdk marked orphaned and its former maintainer > resigned, I take the ti/next branch in as it is, and if no one steps in > as a maintainer for SMDK6400 before end of the 2011-12 releaése merge > window, I will then apply a board removal patch for it. > >> Thanks, >> Sandeep > > Amicalement, Hi Albert, will have a look at it. Regards Simon
On 09/20/2011 08:47 AM, Albert ARIBAUD wrote: > Copying Simon as the author of the commit, in order to confirm that the > issue is in smdk6400. The problem is that I added a nand_read_buf prototype in nand.h this was defined static in nand_base.c - I removed the static declaration. smdk6400 is defining the exact same functions in its SPL but they are static. Dublicated code like this was the reason for my changes. I can provide a quickfix by just remove the static from the smdk6400-functions. But IMHO it is more sensible to write a proper header for most of the functions in nand_base.c and remove the static modifier. Then they can be used in SPLs and no one tries to redo/copy them again. Scott what's your opinion on that? Regards Simon
On 09/21/2011 04:13 AM, Simon Schwarz wrote: > I can provide a quickfix by just remove the static from the > smdk6400-functions. But IMHO it is more sensible to write a proper > header for most of the functions in nand_base.c and remove the static > modifier. Then they can be used in SPLs and no one tries to redo/copy > them again. Scott what's your opinion on that? Sounds good. -Scott
Please pull u-boot-ti/next. I checked all the patches for checkpatch errors. Also all OMAP3 and OMAP4 built with no issues. Thanks, Sandeep The following changes since commit 3522ad62864669b335b85f5abcd136a84bbb7519: Ajay Bhargav (1): Armada100: Enable 88E3015 PHY support for GplugD are available in the git repository at: git://git.denx.de/u-boot-ti.git next Philip Balister (2): OMAP3: Overo: Update GPMC timing for ethernet chip overo: Set IEN on GPMC_CLK to support synchronous clocking. Sandeep Paulraj (1): devkit8000: Fix build break Simon Schwarz (9): omap-common/omap4: relocate early UART clock setup omap3: Configure RAM bank 0 if in SPL omap-common: add nand spl support spl: add NAND Library to new SPL spl: Add POWER library to new spl omap3: new SPL structure support devkit8000: Add nand-spl support for new SPL omap3: implement boot parameter saving omap-common: reorganize spl.c arch/arm/cpu/armv7/omap-common/Makefile | 6 + arch/arm/cpu/armv7/omap-common/spl.c | 165 +++--------------- arch/arm/cpu/armv7/omap-common/spl_mmc.c | 150 ++++++++++++++++ arch/arm/cpu/armv7/omap-common/spl_nand.c | 71 ++++++++ arch/arm/cpu/armv7/omap3/board.c | 50 ++++++- arch/arm/cpu/armv7/omap3/config.mk | 30 ++++ arch/arm/cpu/armv7/omap3/lowlevel_init.S | 10 + arch/arm/cpu/armv7/omap3/sdrc.c | 32 ++++- arch/arm/cpu/armv7/omap4/board.c | 1 + arch/arm/include/asm/arch-omap3/mem.h | 36 ++++ arch/arm/include/asm/arch-omap3/omap_gpmc.h | 9 + arch/arm/include/asm/arch-omap3/sys_proto.h | 1 + arch/arm/include/asm/omap_common.h | 31 ++++ board/isee/igep0020/igep0020.c | 1 + board/isee/igep0020/igep0020.h | 9 - board/overo/overo.c | 1 + board/overo/overo.h | 11 +- board/timll/devkit8000/devkit8000.c | 2 +- doc/README.SPL | 2 + drivers/mtd/nand/Makefile | 10 +- drivers/mtd/nand/nand_base.c | 4 +- drivers/mtd/nand/nand_spl_simple.c | 245 +++++++++++++++++++++++++++ drivers/mtd/nand/omap_gpmc.c | 27 +++ include/configs/devkit8000.h | 46 +++++ include/nand.h | 6 + spl/Makefile | 2 + 26 files changed, 794 insertions(+), 164 deletions(-) create mode 100644 arch/arm/cpu/armv7/omap-common/spl_mmc.c create mode 100644 arch/arm/cpu/armv7/omap-common/spl_nand.c create mode 100644 arch/arm/cpu/armv7/omap3/config.mk create mode 100644 drivers/mtd/nand/nand_spl_simple.c