From d5c2b11ce40f8ca849008938515e742e6b7efc18 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 24 Sep 2016 18:20:02 -0600 Subject: spl: Convert spl_nand_load_image() to use linker list Add a linker list declaration for this method and remove the explicit switch() code. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- common/spl/spl_nand.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'common/spl/spl_nand.c') diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 575de661d3..ed758e518c 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -67,7 +67,7 @@ static int spl_nand_load_element(int offset, struct image_header *header) } } -int spl_nand_load_image(void) +static int spl_nand_load_image(struct spl_boot_device *bootdev) { int err; struct image_header *header; @@ -145,3 +145,5 @@ int spl_nand_load_image(void) return err; } #endif +/* Use priorty 1 so that Ubi can override this */ +SPL_LOAD_IMAGE_METHOD(1, BOOT_DEVICE_NAND, spl_nand_load_image); -- cgit v1.2.1