From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Sun, 18 Sep 2016 13:44:57 -0600 Subject: [U-Boot] [PATCH 08/27] spl: Add a way to declare an SPL image loader In-Reply-To: <1474227917-9256-1-git-send-email-sjg@chromium.org> References: <1474227917-9256-1-git-send-email-sjg@chromium.org> Message-ID: <1474227917-9256-9-git-send-email-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Add a linker list macro which can be used to declare an SPL image loader. Update spl_load_image() to search available loaders for the correct one. Signed-off-by: Simon Glass --- common/spl/spl.c | 20 ++++++++++++++++++++ include/spl.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/common/spl/spl.c b/common/spl/spl.c index 3716e6a..719ae6e 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -344,12 +344,32 @@ static void announce_boot_device(u32 boot_device) static inline void announce_boot_device(u32 boot_device) { } #endif +static struct spl_image_loader *spL_find_loader(uint boot_device) +{ + struct spl_image_loader *drv = + ll_entry_start(struct spl_image_loader, spl_image_loader); + const int n_ents = + ll_entry_count(struct spl_image_loader, spl_image_loader); + struct spl_image_loader *entry; + + for (entry = drv; entry != drv + n_ents; entry++) { + if (boot_device == entry->boot_device) + return entry; + } + + /* Not found */ + return NULL; +} + static int spl_load_image(u32 boot_device) { struct spl_boot_device bootdev; + struct spl_image_loader *loader = spL_find_loader(boot_device); bootdev.boot_device = boot_device; bootdev.boot_device_name = NULL; + if (loader) + return loader->load_image(&bootdev); switch (boot_device) { #ifdef CONFIG_SPL_RAM_DEVICE diff --git a/include/spl.h b/include/spl.h index 63ca68c..8f19310 100644 --- a/include/spl.h +++ b/include/spl.h @@ -149,6 +149,38 @@ struct spl_boot_device { const char *boot_device_name; }; +/** + * Holds information about a way of loading an SPL image + * + * @boot_device: Boot device that this loader supports + * @load_image: Function to call to load image + */ +struct spl_image_loader { + uint boot_device; + /** + * load_image() - Load an SPL image + * + * @bootdev: describes the boot device to load from + */ + int (*load_image)(struct spl_boot_device *bootdev); +}; + +/* Declare an SPL image loader */ +#define SPL_LOAD_IMAGE(__name) \ + ll_entry_declare(struct spl_image_loader, __name, spl_image_loader) + +/* + * __priority is the priority of this method, 0 meaning it will be the top + * choice for this device, 9 meaning it is the bottom choice. + * __boot_device is the BOOT_DEVICE_... value + * __method is the load_image function to call + */ +#define SPL_LOAD_IMAGE_METHOD(__priority, __boot_device, __method) \ + SPL_LOAD_IMAGE(__method ## __priority ## __boot_device) = { \ + .boot_device = __boot_device, \ + .load_image = __method, \ + } + /* NAND SPL functions */ int spl_nand_load_image(struct spl_boot_device *bootdev); -- 2.8.0.rc3.226.g39d4020