diff options
author | Tom Rini <trini@konsulko.com> | 2018-02-16 13:56:02 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-02-16 13:56:02 -0500 |
commit | bd650cd404b6dc870b6cc220025f35da4b31d0f4 (patch) | |
tree | 5082c02c7320fe0410624ccd1d9d6628905ca9df /arch | |
parent | 7961b9f6db19d039b4e6e9c21a9715b6d5b92393 (diff) | |
parent | 5b6ae550a8d88ca8c7b5c39642fe767729422edb (diff) | |
download | u-boot-bd650cd404b6dc870b6cc220025f35da4b31d0f4.zip u-boot-bd650cd404b6dc870b6cc220025f35da4b31d0f4.tar.gz u-boot-bd650cd404b6dc870b6cc220025f35da4b31d0f4.tar.bz2 |
Merge git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/dts/r8a7791-porter.dts | 1 | ||||
-rw-r--r-- | arch/arm/dts/r8a779x-u-boot.dtsi | 8 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/Kconfig.32 | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/dts/r8a7791-porter.dts b/arch/arm/dts/r8a7791-porter.dts index bc93bb2..3d47daa 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 0baac1d..f34cb94 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 ab05966..a96938c 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" |