Skip to contentSkip to conversation

spl: pass args to board_return_to_bootrom

PATCH New Peng Fan 2 participants 3 messages Aug 7, 2019 – Aug 13, 2019

Subsystems (3)
lore
Share & tools
lore

Peng Fan

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Philipp Tomsich <[email protected]>
Cc Kever Yang <[email protected]>

---

This is to prepare i.MX8MM ROMAPI support, and
This is an updated version for https://patchwork.ozlabs.org/patch/1128834/,
because there are changes in rockchip spl/tpl.

Kever, Philipp
Please help review again. Thanks.

 arch/arm/cpu/arm926ejs/spear/spl.c | 5 ++++-
 arch/arm/mach-rockchip/spl.c       | 5 ++++-
 arch/arm/mach-rockchip/tpl.c       | 5 ++++-
 common/spl/spl_bootrom.c           | 7 ++++---
 include/spl.h                      | 3 ++-
 5 files changed, 18 insertions(+), 7 deletions(-)
arch/arm/cpu/arm926ejs/spear/spl.c +4 -1
index fc332fb626..a919a455eb 100644
@@ -277,7 +277,8 @@ void board_init_f(ulong dummy)
  * BootROM code right after having initialized a few components like the DRAM).
  * The following function is called from SPL common code (board_init_r).
  */
-void board_return_to_bootrom(void)
+int board_return_to_bootrom(struct spl_image_info *spl_image,
+			    struct spl_boot_device *bootdev)
 {
 	/*
 	 * Retrieve the BootROM's stack pointer and jump back to the start of
@@ -294,4 +295,6 @@ void board_return_to_bootrom(void)
 		      "bl back_to_bootrom;"
 #endif
 		      );
+
+	return 0;
 }
arch/arm/mach-rockchip/spl.c +4 -1
index 33137cc5ef..92102b39e7 100644
@@ -14,9 +14,12 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void board_return_to_bootrom(void)
+int board_return_to_bootrom(struct spl_image_info *spl_image,
+			    struct spl_boot_device *bootdev)
 {
 	back_to_bootrom(BROM_BOOT_NEXTSTAGE);
+
+	return 0;
 }
 
 __weak const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
arch/arm/mach-rockchip/tpl.c +4 -1
index 55f6e922d0..c3734cb070 100644
@@ -77,9 +77,12 @@ void board_init_f(ulong dummy)
 	}
 }
 
-void board_return_to_bootrom(void)
+int board_return_to_bootrom(struct spl_image_info *spl_image,
+			    struct spl_boot_device *bootdev)
 {
 	back_to_bootrom(BROM_BOOT_NEXTSTAGE);
+
+	return 0;
 }
 
 u32 spl_boot_device(void)
common/spl/spl_bootrom.c +4 -3
index 076f5d8d93..0eefd39a51 100644
@@ -6,8 +6,10 @@
 #include <common.h>
 #include <spl.h>
 
-__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);
include/spl.h +2 -1
index a90f971a23..f4a5461b4e 100644
@@ -382,7 +382,8 @@ void spl_optee_entry(void *arg0, void *arg1, void *arg2, void *arg3);
  * stage wants to return to the ROM code to continue booting, boards
  * can implement 'board_return_to_bootrom'.
  */
-void board_return_to_bootrom(void);
+int board_return_to_bootrom(struct spl_image_info *spl_image,
+			    struct spl_boot_device *bootdev);
 
 /**
  * board_spl_fit_post_load - allow process images after loading finished
Signature · 1 line
2.16.4
#1 lore raw

PATCH 1/1 spl: pass args to board_return_to_bootrom

Quoted 7 lines · Peng Fan

Pass spl_image and bootdev to board_return_bootrom. i.MX8MN needs the args to let ROM to load images

Cc Simon Glass <[email protected]>
Cc Philipp Tomsich <[email protected]>
Cc Kever Yang <[email protected]>

Thanks,
- Kever

Quoted 113 lines

---

This is to prepare i.MX8MM ROMAPI support, and
This is an updated version for https://patchwork.ozlabs.org/patch/1128834/,
because there are changes in rockchip spl/tpl.

Kever, Philipp
Please help review again. Thanks.

  arch/arm/cpu/arm926ejs/spear/spl.c | 5 ++++-
  arch/arm/mach-rockchip/spl.c       | 5 ++++-
  arch/arm/mach-rockchip/tpl.c       | 5 ++++-
  common/spl/spl_bootrom.c           | 7 ++++---
  include/spl.h                      | 3 ++-
  5 files changed, 18 insertions(+), 7 deletions(-)
arch/arm/cpu/arm926ejs/spear/spl.c +4 -1
index fc332fb626..a919a455eb 100644
@@ -277,7 +277,8 @@ void board_init_f(ulong dummy)
   * BootROM code right after having initialized a few components like the DRAM).
   * The following function is called from SPL common code (board_init_r).
   */
-void board_return_to_bootrom(void)
+int board_return_to_bootrom(struct spl_image_info *spl_image,
+			    struct spl_boot_device *bootdev)
  {
  	/*
  	 * Retrieve the BootROM's stack pointer and jump back to the start of
@@ -294,4 +295,6 @@ void board_return_to_bootrom(void)
  		      "bl back_to_bootrom;"
  #endif
  		      );
+
+	return 0;
  }
arch/arm/mach-rockchip/spl.c +4 -1
index 33137cc5ef..92102b39e7 100644
@@ -14,9 +14,12 @@
 
  DECLARE_GLOBAL_DATA_PTR;
 
-void board_return_to_bootrom(void)
+int board_return_to_bootrom(struct spl_image_info *spl_image,
+			    struct spl_boot_device *bootdev)
  {
  	back_to_bootrom(BROM_BOOT_NEXTSTAGE);
+
+	return 0;
  }
 
  __weak const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
arch/arm/mach-rockchip/tpl.c +4 -1
index 55f6e922d0..c3734cb070 100644
@@ -77,9 +77,12 @@ void board_init_f(ulong dummy)
  	}
  }
 
-void board_return_to_bootrom(void)
+int board_return_to_bootrom(struct spl_image_info *spl_image,
+			    struct spl_boot_device *bootdev)
  {
  	back_to_bootrom(BROM_BOOT_NEXTSTAGE);
+
+	return 0;
  }
 
  u32 spl_boot_device(void)
common/spl/spl_bootrom.c +4 -3
index 076f5d8d93..0eefd39a51 100644
@@ -6,8 +6,10 @@
  #include <common.h>
  #include <spl.h>
 
-__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);
include/spl.h +2 -1
index a90f971a23..f4a5461b4e 100644
@@ -382,7 +382,8 @@ void spl_optee_entry(void *arg0, void *arg1, void *arg2, void *arg3);
   * stage wants to return to the ROM code to continue booting, boards
   * can implement 'board_return_to_bootrom'.
   */
-void board_return_to_bootrom(void);
+int board_return_to_bootrom(struct spl_image_info *spl_image,
+			    struct spl_boot_device *bootdev);
 
  /**
   * board_spl_fit_post_load - allow process images after loading finished
author Applied
#2 lore raw

PATCH 1/1 spl: pass args to board_return_to_bootrom

In reply to Peng Fan
Quoted 10 lines

Subject: [PATCH] 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 <[email protected]>
Cc Philipp Tomsich <[email protected]>
Cc Kever Yang <[email protected]>

---

Applied to nxp-imx-8-13, with Kever's tag applied.
https://github.com/MrVan/u-boot/tree/nxp-imx-8-13

Regards,
Peng.