diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-03 23:20:20 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-03 23:24:31 -0500 |
| commit | 3aaabfe9ff4bbcd11096513b1b28d1fb0a40800f (patch) | |
| tree | cf8ffc29edb6bd06cd7ba02f1eb246798289539e /board | |
| parent | 3e5f4b337d89e95af9d3700a4b055b552bf22ac4 (diff) | |
| parent | b6ffd58e45043b822844345d4ca9b2cb1e2917b7 (diff) | |
| download | u-boot-3aaabfe9ff4bbcd11096513b1b28d1fb0a40800f.zip u-boot-3aaabfe9ff4bbcd11096513b1b28d1fb0a40800f.tar.gz u-boot-3aaabfe9ff4bbcd11096513b1b28d1fb0a40800f.tar.bz2 | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
This is the promised second part of the sunxi PR for 2022.04, albeit
technially outside of the merge window. We were working on this full
steam since the beginning of the year, and it deserves to be merged,
I think.
The main attraction is support for the F1C100s SoC, which sports a
venerable ARM926 core. Support for this SoC and the LicheePi Nano board
has been in Linux for years, and U-Boot patches were posted mid last
year already.
The new SoC using ARMv5 also means that the bulk of the new code should
not touch any existing boards, although we did some refactorings first,
of course, which actually cleans up some existing sunxi code.
Compile tested for all 160 sunxi boards, and briefly tested on BananaPi M1,
OrangePi Zero, Pine64 and Pine-H64. Tested by others on their boards,
including F1C100s and F1C200s devices.
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/MAINTAINERS | 5 | ||||
| -rw-r--r-- | board/sunxi/board.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 56a0ee3..5a0b598 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -266,6 +266,11 @@ M: Icenowy Zheng <icenowy@aosc.xyz> S: Maintained F: configs/LicheePi_Zero_defconfig +LICHEEPI NANO BOARD +M: Icenowy Zheng <icenowy@aosc.xyz> +S: Maintained +F: configs/licheepi_nano_defconfig + LINKSPRITE-PCDUINO BOARD M: Zoltan Herpai <wigyori@uid0.hu> S: Maintained diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 9146300..82c52b2 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) |