diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-16 11:19:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-16 11:19:31 -0400 |
| commit | 0e80dda32c8d724c2a98dbbfb2f1e59762788f15 (patch) | |
| tree | a569b9b170c85a3bcae895c21c72def941ca9af9 /board | |
| parent | 9c94e0a64490b90d48995a8230499167c0bdca68 (diff) | |
| parent | f96238e253661b43168352010a2628957940bd4b (diff) | |
| download | u-boot-0e80dda32c8d724c2a98dbbfb2f1e59762788f15.tar.gz | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi
- Beelink-x2 STB support (Marcus)
- H6 DDR3, LPDDR3 changes (Andre, Jernej)
- H6 pin controller, USB PHY (Andre)
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index bdd1854197..c7e9d3eda0 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -172,6 +172,12 @@ S: Maintained F: configs/beelink_gs1_defconfig F: arch/arm/dts/sun50i-h6-beelink-gs1.dts +BEELINK X2 BOARD +M: Marcus Cooper <codekipper@gmail.com> +S: Maintained +F: configs/beelink_x2_defconfig +F: arch/arm/dts/sun8i-h3-beelink-x2.dts + COLOMBUS BOARD M: Maxime Ripard <maxime.ripard@bootlin.com> S: Maintained |