Merge git://git.denx.de/u-boot-sh

2018-02-16 13:56:02 -05:00
parent 7961b9f6db 5b6ae550a8
commit bd650cd404
17 changed files with 92 additions and 23 deletions
--- a/arch/arm/dts/r8a7791-porter.dts
+++ b/arch/arm/dts/r8a7791-porter.dts
@@ -214,6 +214,7 @@
 &scif0 {
 	pinctrl-0 = <&scif0_pins>;
 	pinctrl-names = "default";
+	u-boot,dm-pre-reloc;

 	status = "okay";
 };
--- a/arch/arm/dts/r8a779x-u-boot.dtsi
+++ b/arch/arm/dts/r8a779x-u-boot.dtsi
@@ -20,6 +20,14 @@
 	u-boot,dm-pre-reloc;
 };

+&pfc {
+	u-boot,dm-pre-reloc;
+};
+
 &prr {
 	u-boot,dm-pre-reloc;
 };
+
+&rst {
+	u-boot,dm-pre-reloc;
+};
--- a/arch/arm/mach-rmobile/Kconfig.32
+++ b/arch/arm/mach-rmobile/Kconfig.32
@@ -70,6 +70,8 @@ config TARGET_PORTER
 	bool "Porter board"
 	select DM
 	select DM_SERIAL
+	select SUPPORT_SPL
+	select SPL_DM if SPL

 config TARGET_STOUT
 	bool "Stout board"