| Message ID | 20220105003508.1143140-8-Mr.Bossman075@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Andre Przywara |
| Headers | show |
| Series | Add support for SUNIV and F1C100s. | expand |
On Tue, 4 Jan 2022 19:35:04 -0500 Jesse Taube <mr.bossman075@gmail.com> wrote: Hi, > From: Icenowy Zheng <icenowy@aosc.io> > > Generic Timer Extension is not available on SUNIV. Well, that, plus there are no ID registers with which we could query this. But that has the same effect, so: > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > Signed-off-by: Jesse Taube <Mr.Bossman075@gmail.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre > --- > board/sunxi/board.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/board/sunxi/board.c b/board/sunxi/board.c > index 2790a0f9e8..59eb195c26 100644 > --- a/board/sunxi/board.c > +++ b/board/sunxi/board.c > @@ -197,7 +197,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? */ > @@ -224,7 +224,7 @@ int board_init(void) > #endif > } > } > -#endif /* !CONFIG_ARM64 */ > +#endif /* !CONFIG_ARM64 && !CONFIG_MACH_SUNIV */ > > ret = axp_gpio_init(); > if (ret)
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 2790a0f9e8..59eb195c26 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -197,7 +197,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? */ @@ -224,7 +224,7 @@ int board_init(void) #endif } } -#endif /* !CONFIG_ARM64 */ +#endif /* !CONFIG_ARM64 && !CONFIG_MACH_SUNIV */ ret = axp_gpio_init(); if (ret)