aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-04-05 22:39:10 -0400
committerTom Rini <trini@konsulko.com>2021-04-05 22:39:10 -0400
commit472fd5a35af3308f97de0376a6c25f5368035557 (patch)
tree8410af336a68a38cf42c63494567a0790758c1dd /board
parent90eba245a66aa20589404ba537215faf2012c1a3 (diff)
parenta99d70c180dc083b47673b5f0282fc8ba8193bc9 (diff)
downloadu-boot-472fd5a35af3308f97de0376a6c25f5368035557.zip
u-boot-472fd5a35af3308f97de0376a6c25f5368035557.tar.gz
u-boot-472fd5a35af3308f97de0376a6c25f5368035557.tar.bz2
Merge tag 'rockchip-for-v2021.07' of https://source.denx.de/u-boot/custodians/u-boot-rockchipWIP/05Apr2021
- Fix rk3368 lion board support; - Fix px30 odroid-go2 board support; - Add rk3399 NanoPi R4s and NanoPi M4B board support;
Diffstat (limited to 'board')
-rw-r--r--board/rockchip/evb_rk3399/MAINTAINERS12
-rw-r--r--board/theobroma-systems/puma_rk3399/Kconfig2
2 files changed, 13 insertions, 1 deletions
diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS
index 4c889e0..25e308d 100644
--- a/board/rockchip/evb_rk3399/MAINTAINERS
+++ b/board/rockchip/evb_rk3399/MAINTAINERS
@@ -49,12 +49,24 @@ S: Maintained
F: configs/nanopi-m4-2gb-rk3399_defconfig
F: arch/arm/dts/rk3399-nanopi-m4-2gb-u-boot.dtsi
+NANOPI-M4B
+M: Alexandre Vicenzi <linux@alxd.me>
+S: Maintained
+F: configs/nanopi-m4b-rk3399_defconfig
+F: arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi
+
NANOPI-NEO4
M: Jagan Teki <jagan@amarulasolutions.com>
S: Maintained
F: configs/nanopi-neo4-rk3399_defconfig
F: arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi
+NANOPI-R4S
+M: Xiaobo Tian <peterwillcn@gmail.com>
+S: Maintained
+F: configs/nanopi-r4s-rk3399_defconfig
+F: arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi
+
ORANGEPI-RK3399
M: Jagan Teki <jagan@amarulasolutions.com>
S: Maintained
diff --git a/board/theobroma-systems/puma_rk3399/Kconfig b/board/theobroma-systems/puma_rk3399/Kconfig
index e82623a..21946d9 100644
--- a/board/theobroma-systems/puma_rk3399/Kconfig
+++ b/board/theobroma-systems/puma_rk3399/Kconfig
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
config ENV_SIZE
- default 0x2000
+ default 0x4000
config ENV_OFFSET
default 0x3fc000 if ENV_IS_IN_SPI_FLASH