aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/dts/rockchip-u-boot.dtsi
diff options
context:
space:
mode:
authorTom Rini2020-07-29 21:16:08 -0400
committerTom Rini2020-07-29 21:16:08 -0400
commit719f42190d5f0238cb01ef2ffba8af2285f7bc7a (patch)
treec789716a82ab552e0d0c1a9242fda7c41b04c238 /arch/arm/dts/rockchip-u-boot.dtsi
parent7cb2060b4e63a89c50739dc8a9fcd5d73f86f0be (diff)
parentb9390ce51cb46f4b4acda320e7ea8e0bd120e4b8 (diff)
Merge tag 'dm-pull-28jul20' of git://git.denx.de/u-boot-dm
Use binman instead of one of the Rockchip build scripts Refactor to allow any arch to create SPI-flash images New button uclass
Diffstat (limited to 'arch/arm/dts/rockchip-u-boot.dtsi')
-rw-r--r--arch/arm/dts/rockchip-u-boot.dtsi10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi
index a2559e2db08..eae3ee715da 100644
--- a/arch/arm/dts/rockchip-u-boot.dtsi
+++ b/arch/arm/dts/rockchip-u-boot.dtsi
@@ -6,7 +6,14 @@
#include <config.h>
/ {
- binman {
+ binman: binman {
+ multiple-images;
+ };
+};
+
+#ifdef CONFIG_SPL
+&binman {
+ simple-bin {
filename = "u-boot-rockchip.bin";
pad-byte = <0xff>;
@@ -19,3 +26,4 @@
};
};
};
+#endif