diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-31 07:17:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-31 07:17:09 -0400 |
| commit | 8a802a2eefd36865eaa3d927d1db7af63bb2d922 (patch) | |
| tree | 9ec5f764bb0eea7436d5fa3b09f1c22a11206482 /board | |
| parent | 55955427cb617763d63e219d4f26d9a9434bc3e2 (diff) | |
| parent | 051c755075ba215ce3de8f14e211c3646b026e9d (diff) | |
Merge tag 'rockchip-for-v2019.07-rc3' of git://git.denx.de/u-boot-rockchip
- some fix for rk3399-puma;
- rockchip script make_fit_atf.py cleanup
- Enable TPL for rk3399 orangepi and nanopi4;
- add support for rk3399 boards: Nanopi NEO4, Rockpro64, Rock PI 4;
Diffstat (limited to 'board')
| -rw-r--r-- | board/rockchip/evb_rk3399/MAINTAINERS | 20 | ||||
| -rw-r--r-- | board/theobroma-systems/puma_rk3399/Kconfig | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS index f55c92f80c3..3308b3595fd 100644 --- a/board/rockchip/evb_rk3399/MAINTAINERS +++ b/board/rockchip/evb_rk3399/MAINTAINERS @@ -18,9 +18,29 @@ S: Maintained F: configs/nanopi-m4-rk3399_defconfig F: arch/arm/dts/rk3399-nanopi-m4-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 + ORANGEPI-RK3399 M: Jagan Teki <jagan@amarulasolutions.com> S: Maintained F: configs/orangepi-rk3399_defconfig F: arch/arm/dts/rk3399-u-boot.dtsi F: arch/arm/dts/rk3399-orangepi-u-boot.dtsi + +ROCK-PI-4 +M: Akash Gajjar <akash@openedev.com> +M: Jagan Teki <jagan@amarulasolutions.com> +S: Maintained +F: configs/rock-pi-4-rk3399_defconfig +F: arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi + +ROCKPRO64 +M: Akash Gajjar <akash@openedev.com> +M: Jagan Teki <jagan@amarulasolutions.com> +S: Maintained +F: configs/rockpro64-rk3399_defconfig +F: arch/arm/dts/rk3399-rockpro64-u-boot.dtsi diff --git a/board/theobroma-systems/puma_rk3399/Kconfig b/board/theobroma-systems/puma_rk3399/Kconfig index 8a94cbd9edb..9e232527549 100644 --- a/board/theobroma-systems/puma_rk3399/Kconfig +++ b/board/theobroma-systems/puma_rk3399/Kconfig @@ -16,6 +16,6 @@ config ENV_SIZE default 0x2000 config ENV_OFFSET - default 0x3c000 if ENV_IS_IN_SPI_FLASH + default 0x3fc000 if ENV_IS_IN_SPI_FLASH endif |