summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-02-16 13:56:02 -0500
committerTom Rini <trini@konsulko.com>2018-02-16 13:56:02 -0500
commitbd650cd404b6dc870b6cc220025f35da4b31d0f4 (patch)
tree5082c02c7320fe0410624ccd1d9d6628905ca9df /arch
parent7961b9f6db19d039b4e6e9c21a9715b6d5b92393 (diff)
parent5b6ae550a8d88ca8c7b5c39642fe767729422edb (diff)
Merge git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/r8a7791-porter.dts1
-rw-r--r--arch/arm/dts/r8a779x-u-boot.dtsi8
-rw-r--r--arch/arm/mach-rmobile/Kconfig.322
3 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/dts/r8a7791-porter.dts b/arch/arm/dts/r8a7791-porter.dts
index bc93bb24e4..3d47daa08b 100644
--- 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";
};
diff --git a/arch/arm/dts/r8a779x-u-boot.dtsi b/arch/arm/dts/r8a779x-u-boot.dtsi
index 0baac1d2c5..f34cb942ed 100644
--- 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;
+};
diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32
index ab05966d15..a96938c01e 100644
--- 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"