diff mbox series

[23/27] sunxi: suniv: do not detect boot sector on suniv

Message ID 20210725231636.879913-24-me@yifangu.com
State Deferred
Delegated to: Tom Rini
Headers show
Series Add F1C100s based PocketGo handheld support | expand

Commit Message

Yifan Gu July 25, 2021, 11:16 p.m. UTC 
The BROM of suniv does not pass info to SPL, and it should always boot
from the 8KB offset.

Signed-off-by: Yifan Gu <me@yifangu.com>
---
 arch/arm/mach-sunxi/board.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index 7fa44b6f3a..90c58ce86c 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -305,6 +305,7 @@  uint32_t sunxi_get_boot_device(void)
 }
 
 #ifdef CONFIG_SPL_BUILD
+#ifndef CONFIG_MACH_SUNIV
 static u32 sunxi_get_spl_size(void)
 {
 	if (!is_boot0_magic(SPL_ADDR + 4)) /* eGON.BT0 */
@@ -339,8 +340,6 @@  unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
 	return sector;
 }
 
-
-#ifndef CONFIG_MACH_SUNIV
 u32 spl_boot_device(void)
 {
 	return sunxi_get_boot_device();