Stephen, > -----Original Message----- > From: Stephen Warren [mailto:swar...@wwwdotorg.org] > Sent: Wednesday, November 28, 2012 2:03 PM > To: Simon Glass > Cc: u-boot@lists.denx.de; Tom Warren; Stephen Warren; Marc Dietrich; Thierry > Reding > Subject: Re: [PATCH 1/3] tegra: only define TEGRA_DEVICE_SETTINGS if not > already defined > > On 11/28/2012 02:01 PM, Simon Glass wrote: > > Hi Stephen, > > > > On Wed, Nov 28, 2012 at 9:50 AM, Stephen Warren <swar...@wwwdotorg.org> > wrote: > >> From: Stephen Warren <swar...@nvidia.com> > >> > >> seaboard.h attempts to undefine TEGRA_DEVICE_SETTINGS and provide a > >> custom value. This worked when the "pre" included tegra20-common.h > >> provided the default. However, changes in the main U-Boot repo > >> removed this default from the "pre" included tegra20-common.h to the > "post" > >> included tegra-common-post.h, which uncondtionally provides the value. > >> This causes the following compile warnings: > >> > >> In file included from /home/swarren/shared/git_wa/u- > boot/include/configs/seaboard.h:129:0, > >> from /home/swarren/shared/git_wa/u- > boot/include/config.h:10, > >> from /home/swarren/shared/git_wa/u- > boot/include/common.h:37, > >> from lib/asm-offsets.c:18: > >> /home/swarren/shared/git_wa/u-boot/include/configs/tegra-common-post. > >> h:163:0: warning: "TEGRA_DEVICE_SETTINGS" redefined > >> /home/swarren/shared/git_wa/u-boot/include/configs/seaboard.h:110:0: > >> note: this is the location of the previous definition > >> > >> Solve this by modifying tegra-common-post.h to only provide a value > >> for TEGRA_DEVICE_SETTINGS if the board-specific header has not > >> already provided a custom value. > >> > >> Signed-off-by: Stephen Warren <swar...@nvidia.com> > > > > These series doesn't apply to u-boot-tegra/master or /next for me, and > > the last one doesn't seem to apply to u-boot/master either. Can you > > please take a look, may be a timing issue. > > Yes, as I mentioned this problem will only exist once u-boot/master and u- > boot-arm/master are merged together, so this patch series applies to the > result of the merge, which will be (at least part of) the state of > u-boot-tegra/* at some unspecified future time:-) Allen's TEGRA_DEVICE_SETTINGS patch is already in u-boot/master. I applied it to u-boot-tegra/master, then applied your 1/3 & 2/3 patches (3/3 isn't needed if Allen's patch is already in). Ran a MAKEALL -s tegra20 and that was fine. I then applied the LCD patches that are in u-boot-tegra/next (paz00, etc.), and then I applied Marc's 'tegra: remove custom TEGRA_DEVICE_SETTINGS ...' patch on top of that. Again, MAKEALL was OK. The resulting binaries seem to have the correct settings for stdin,stdout,stderr AFAICT.
I'm going to push a new u-boot-tegra/master to denx.de for you, Marc, Simon, etc. to check out to make sure everything works the way you expect. I'll also do a git bisect through the top half-dozen commits. Tom -- nvpublic _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot