[U-Boot] [PATCH 1/7] sunxi: binman: Fix U-Boot binary size check

[Samuel Holland]

On 01/25/18 09:27, Maxime Ripard wrote:
> On Wed, Jan 24, 2018 at 07:13:54AM -0600, Samuel Holland wrote:
>> On 01/24/18 02:38, Maxime Ripard wrote:
>>> Hi!
>>>
>>> On Tue, Jan 23, 2018 at 04:18:13PM -0600, Samuel Holland wrote:
>>>> If raw mode is disabled, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR is not
>>>> defined, which breaks compiling the device trees. Only enable the size
>>>> check when it actually matters--that is, when MMC raw mode is enabled.
>>>>
>>>> Signed-off-by: Samuel Holland <samuel at sholland.org>
>>>> ---
>>>>  arch/arm/dts/sunxi-u-boot.dtsi | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
>>>> index 72e95afd78..996f391030 100644
>>>> --- a/arch/arm/dts/sunxi-u-boot.dtsi
>>>> +++ b/arch/arm/dts/sunxi-u-boot.dtsi
>>>> @@ -17,7 +17,7 @@
>>>>  			filename = "spl/sunxi-spl.bin";
>>>>  		};
>>>>  		u-boot-img {
>>>> -#ifdef CONFIG_MMC
>>>> +#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
>>>
>>> Why don't you change for ENV_IS_IN_MMC like your commit log would
>>> suggest?
>>
>> Because if the environment is in MMC but U-Boot isn't (e.g. it's in SPI), or
>> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is in effect and the U-Boot image
>> is stored after the environment in MMC, then there's no chance of overlap and
>> the size doesn't matter.
> 
> Ah, right. Can you put that in your commit log?

Sure, I'll do that for v2.

> Thanks!
> Maxime

Thanks,
Samuel