From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Goldschmidt Date: Thu, 26 Sep 2019 14:32:42 +0200 Subject: [U-Boot] [PATCH v2 06/38] spl: Correct priority selection for image loaders In-Reply-To: <20190925141147.191166-7-sjg@chromium.org> References: <20190925141147.191166-1-sjg@chromium.org> <20190925141147.191166-7-sjg@chromium.org> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Wed, Sep 25, 2019 at 4:15 PM Simon Glass wrote: > > At present the name of the image comes first in the linker-list symbol > used. This means that the name of the function sets the sort order, which > is not the intention. > > Update it to put the board device type first, then the priority. This Did you mean "boot device type"? Regards, Simon > produces the expected behaviour. > > Signed-off-by: Simon Glass > --- > > Changes in v2: None > > include/spl.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/spl.h b/include/spl.h > index e4640f3830b..4bc35cb0e77 100644 > --- a/include/spl.h > +++ b/include/spl.h > @@ -254,14 +254,14 @@ struct spl_image_loader { > */ > #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT > #define SPL_LOAD_IMAGE_METHOD(_name, _priority, _boot_device, _method) \ > - SPL_LOAD_IMAGE(_method ## _priority ## _boot_device) = { \ > + SPL_LOAD_IMAGE(_boot_device ## _priority ## _method) = { \ > .name = _name, \ > .boot_device = _boot_device, \ > .load_image = _method, \ > } > #else > #define SPL_LOAD_IMAGE_METHOD(_name, _priority, _boot_device, _method) \ > - SPL_LOAD_IMAGE(_method ## _priority ## _boot_device) = { \ > + SPL_LOAD_IMAGE(_boot_device ## _priority ## _method) = { \ > .boot_device = _boot_device, \ > .load_image = _method, \ > } > -- > 2.23.0.444.g18eeb5a265-goog > > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > https://lists.denx.de/listinfo/u-boot