From cda789a5b1c049bfc3592dfbba19d261c2c0c6c4 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Wed, 7 Aug 2019 06:40:53 +0000 Subject: spl: pass args to board_return_to_bootrom Pass spl_image and bootdev to board_return_bootrom. i.MX8MN needs the args to let ROM to load images Cc: Simon Glass Cc: Philipp Tomsich Cc: Kever Yang Signed-off-by: Peng Fan Reviewed-by: Kever Yang --- common/spl/spl_bootrom.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'common') diff --git a/common/spl/spl_bootrom.c b/common/spl/spl_bootrom.c index 076f5d8..0eefd39 100644 --- a/common/spl/spl_bootrom.c +++ b/common/spl/spl_bootrom.c @@ -6,8 +6,10 @@ #include #include -__weak void board_return_to_bootrom(void) +__weak int board_return_to_bootrom(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev) { + return 0; } static int spl_return_to_bootrom(struct spl_image_info *spl_image, @@ -19,8 +21,7 @@ static int spl_return_to_bootrom(struct spl_image_info *spl_image, * the ROM), it will implement board_return_to_bootrom() and * should not return from it. */ - board_return_to_bootrom(); - return false; + return board_return_to_bootrom(spl_image, bootdev); } SPL_LOAD_IMAGE_METHOD("BOOTROM", 0, BOOT_DEVICE_BOOTROM, spl_return_to_bootrom); -- cgit v1.1