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

Tom Rini trini at konsulko.com
Tue Feb 14 21:04:28 UTC 2017


On Tue, Feb 14, 2017 at 02:32:42PM -0600, Andrew F. Davis wrote:
> On 02/14/2017 02:15 PM, Tom Rini wrote:
> > On Mon, Feb 13, 2017 at 12:47:36PM -0600, Andrew F. Davis 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                  | 10 ++++++----
> >>  include/configs/imx6_spl.h        |  4 ++--
> >>  include/configs/socfpga_de1_soc.h |  2 +-
> > 
> > OK, with this in Kconfig, we need to migrate the appropriate configs/
> > files rather than tweak include/configs/ files again.  I think
> > moveconfig.py will be reasonable to run here given that you can pass a
> > list of defconfigs to look at (anything that sets CONFIG_IMX6 and so
> > on).  Thanks!
> 
> It does, and it removes the symbols I tweaked in the include/configs/
> automatically. The issue is that it also caused a lot of churn in the
> defconfig files as a lot of symbols have become out of order and get
> re-ordered. With other similar patches re-ordering defconfig symbols
> this would be trouble for you to merge and for me to rebase if it needs
> a re-spin. Maybe moveconfig.py could be done on your side when patches
> like this are taken?

So in this case, the way you deal with it is:
1) Do a moveconfig.py -s and commit the results.
2) Do the rest of your patches
3) Drop that first patch and post.  If it doesn't apply cleanly
(sometimes it in fact does), I end up dealing with the fallout.

It's easier for me to deal with fixing defconfig fails to apply than it
is to be sure that everything is migrated correctly and as intended.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170214/e8e51edb/attachment.sig>


More information about the U-Boot mailing list