[U-Boot] [PATCH 1/3] tegra: only define TEGRA_DEVICE_SETTINGS if not already defined

[Simon Glass]

Hi Stephen,

On Wed, Nov 28, 2012 at 1:03 PM, Stephen Warren <swarren at wwwdotorg.org> wrote:
> On 11/28/2012 02:01 PM, Simon Glass wrote:
>> Hi Stephen,
>>
>> On Wed, Nov 28, 2012 at 9:50 AM, Stephen Warren <swarren at wwwdotorg.org> wrote:
>>> From: Stephen Warren <swarren at 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 <swarren at 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:-)

OK so that's what you meant.

For the first two patches, I tested on seaboard:

Tested-by: Simon Glass <sjg at chromium.org>

Regards,
Simon