summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-08-06 09:36:46 -0600
committerTom Rini <trini@konsulko.com>2024-08-06 09:36:46 -0600
commitb7d5ce05b1b52136af09cf34541c6a91079a4b86 (patch)
treecd030b59b9e5ab58e4decad781c526c2b4b8112d /board
parent784c70c04012b86edb5a903d3a6e7958267a7ea5 (diff)
parent541a1649e74787682902d820d0b79e16bad69a4f (diff)
downloadu-boot-b7d5ce05b1b52136af09cf34541c6a91079a4b86.tar.gz
u-boot-b7d5ce05b1b52136af09cf34541c6a91079a4b86.tar.bz2
u-boot-b7d5ce05b1b52136af09cf34541c6a91079a4b86.zip
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
This updates the "old style" DTs to that of Linux v6.10, matching what OF_UPSTREAM is at now. Hopefully we won't need to do this (manually) anymore. Since this brings in the DT for a new board (Tanix TX1), also add the defconfig for that, which has just been waiting for that sync. There are three more fixes: two for the SPI clock setup, which avoids too high frequencies in some cases, and one fix to avoid a build warning with GCC 14 for the sunxi TOC0 part of the mkimage tool. The gitlab CI passed, and I tested the SPI flash on the OrangePi Zero 3 and also booted that into Linux.
Diffstat (limited to 'board')
-rw-r--r--board/sunxi/MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 4bcd9b9af7..4ad77c75f5 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -549,6 +549,12 @@ S: Maintained
F: configs/Sunchip_CX-A99_defconfig
W: https://linux-sunxi.org/Sunchip_CX-A99
+TANIX TX1 BOARD
+M: Andre Przywara <andre.przywara@arm.com>
+S: Maintained
+F: configs/tanix_tx1_defconfig
+W: https://linux-sunxi.org/Tanix_TX1
+
TANIX TX6 BOARD
M: Jernej Skrabec <jernej.skrabec@siol.net>
S: Maintained