[U-Boot] [PATCH v3 1/6] spl: Convert CONFIG_SPL_ABORT_ON_RAW_IMAGE into a positive option

Simon Glass sjg at chromium.org
Tue Feb 14 05:23:44 UTC 2017


Hi Andrew,

On 10 February 2017 at 12:58, Andrew F. Davis <afd at ti.com> wrote:
> On 02/10/2017 12:38 PM, Simon Glass wrote:
>> Hi Andrew,
>>
>> On 8 February 2017 at 10:21, Andrew F. Davis <afd at ti.com> wrote:
>>>
>>> CONFIG_SPL_ABORT_ON_RAW_IMAGE causes SPL to abort and move on when it
>>> encounters RAW images, express this same functionality as a positive
>>> option enabling support for RAW images: CONFIG_SPL_RAW_IMAGE_SUPPORT
>>>
>>> Signed-off-by: Andrew F. Davis <afd at ti.com>
>>> ---
>>>  Kconfig                           | 7 +++++++
>>>  README                            | 4 ----
>>>  common/spl/spl.c                  | 9 +++++----
>>>  include/configs/imx6_spl.h        | 4 ++--
>>>  include/configs/socfpga_de1_soc.h | 2 +-
>>>  include/spl.h                     | 2 +-
>>>  6 files changed, 16 insertions(+), 12 deletions(-)
>>>

[..]

>>> diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
>>> index c5a035fccf..acaf81b6b9 100644
>>> --- a/include/configs/imx6_spl.h
>>> +++ b/include/configs/imx6_spl.h
>>> @@ -45,14 +45,14 @@
>>>  #if defined(CONFIG_SPL_MMC_SUPPORT)
>>>  #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
>>>  #define CONFIG_SYS_MONITOR_LEN                 409600  /* 400 KB */
>>> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>>> +#undef CONFIG_SPL_RAW_IMAGE_SUPPORT
>>
>> I think this needs to be done in the defconfigs, or a a default in
>> imx6 Kconfig. You might be able to change your 'default y' above to
>> 'default y if !xxx' where xxx is the secure boot option.
>>
>
> I was going to finish this conversion by just running moveconfig.py
> CONFIG_SPL_RAW_IMAGE_SUPPORT, but this generated a lot of unrelated
> defconfig re-ordering in the patch. I would need to do something like
> this[0] again before converting.
>
> I think what we could do is let Tom or someone with high level push
> access do these defconfig re-orders all at once after a bunch of new
> symbols have been defined. Otherwise we end up with giant patches that
> are hard to merge and manage.
>
> If not, I can attach the patch moveconfig.py generated.
>

OK with me - will leave this to you and Tom.

Regards,
Simon


More information about the U-Boot mailing list