From: Icenowy Zheng <icenowy@aosc.io>
Date: Sat, 29 Jan 2022 15:23:05 +0000 (-0500)
Subject: sunxi: board: Add support for SUNIV
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=116e1ed1ab68719d1e26a609c8b893770d944946;p=u-boot.git

sunxi: board: Add support for SUNIV

Generic Timer Extension is not available on SUNIV.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Jesse Taube <Mr.Bossman075@gmail.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 91463009b0..82c52b28f8 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -198,7 +198,7 @@ int board_init(void)
 
 	gd->bd->bi_boot_params = (PHYS_SDRAM_0 + 0x100);
 
-#ifndef CONFIG_ARM64
+#if !defined(CONFIG_ARM64) && !defined(CONFIG_MACH_SUNIV)
 	asm volatile("mrc p15, 0, %0, c0, c1, 1" : "=r"(id_pfr1));
 	debug("id_pfr1: 0x%08x\n", id_pfr1);
 	/* Generic Timer Extension available? */
@@ -225,7 +225,7 @@ int board_init(void)
 #endif
 		}
 	}
-#endif /* !CONFIG_ARM64 */
+#endif /* !CONFIG_ARM64 && !CONFIG_MACH_SUNIV */
 
 	ret = axp_gpio_init();
 	if (ret)