Skip to content

Commit

Permalink
Merge tag 'u-boot-rockchip-20191110' of https://gitlab.denx.de/u-boot…
Browse files Browse the repository at this point in the history
…/custodians/u-boot-rockchip

- Add support for rockchip pmic rk805,rk809, rk816, rk817
- Add rk3399 board Leez support
- Fix bug in rk3328 ram driver
- Adapt SPL to support ATF bl31 with entry at 0x40000
- Fix the u8 type comparision with '-1'.
- Fix checkpatch warning for multi blank line and review signature.
  • Loading branch information
trini committed Nov 11, 2019
2 parents 0b73ef0 + f74a089 commit 086e391
Show file tree
Hide file tree
Showing 48 changed files with 2,032 additions and 158 deletions.
1 change: 1 addition & 0 deletions arch/arm/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
rk3399-khadas-edge.dtb \
rk3399-khadas-edge-captain.dtb \
rk3399-khadas-edge-v.dtb \
rk3399-leez-p710.dtb \
rk3399-nanopc-t4.dtb \
rk3399-nanopi-m4.dtb \
rk3399-nanopi-neo4.dtb \
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/dts/rk3328-rock64-u-boot.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@

#include "rk3328-u-boot.dtsi"
#include "rk3328-sdram-lpddr3-1600.dtsi"
/ {
chosen {
u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
};
};

&usb_host0_xhci {
status = "okay";
Expand Down
13 changes: 13 additions & 0 deletions arch/arm/dts/rk3399-leez-p710-u-boot.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2019 Andy Yan <[email protected]>
*/

#include "rk3399-u-boot.dtsi"
#include "rk3399-sdram-lpddr4-100.dtsi"

/ {
chosen {
u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
};
};
Loading

0 comments on commit 086e391

Please sign in to comment.