diff mbox series

[U-Boot] rockchip: dts: rk3328: rock64: Add same-as-spl order

Message ID 20191008175950.77719-1-manu@freebsd.org
State Accepted
Commit b5500b20576e8e786d74d92549ca66d31c92b0d9
Delegated to: Kever Yang
Headers show
Series [U-Boot] rockchip: dts: rk3328: rock64: Add same-as-spl order | expand

Commit Message

Emmanuel Vadot Oct. 8, 2019, 5:59 p.m. UTC
rk3328 can use same-as-spl option so next loaders are loaded from the same
medium.
Add the boot order in the rock64 dts otherwise booting from sdcard
will result in u-boot looking into the eMMC.

Signed-off-by: Emmanuel Vadot <manu@freebsd.org>
---
 arch/arm/dts/rk3328-rock64-u-boot.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Peter Robinson Oct. 9, 2019, 5:16 p.m. UTC | #1
On Tue, Oct 8, 2019 at 7:00 PM Emmanuel Vadot <manu@freebsd.org> wrote:
>
> rk3328 can use same-as-spl option so next loaders are loaded from the same
> medium.
> Add the boot order in the rock64 dts otherwise booting from sdcard
> will result in u-boot looking into the eMMC.
>
> Signed-off-by: Emmanuel Vadot <manu@freebsd.org>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
Tested-by: Peter Robinson <pbrobinson@gmail.com>

Tested on Rock64 device.

> ---
>  arch/arm/dts/rk3328-rock64-u-boot.dtsi | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
> index 1d441f7124..e5946d2d2d 100644
> --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
> +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
> @@ -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";
> --
> 2.22.0
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
Kever Yang Oct. 14, 2019, 9:52 a.m. UTC | #2
On 2019/10/9 上午1:59, Emmanuel Vadot wrote:
> rk3328 can use same-as-spl option so next loaders are loaded from the same
> medium.
> Add the boot order in the rock64 dts otherwise booting from sdcard
> will result in u-boot looking into the eMMC.
>
> Signed-off-by: Emmanuel Vadot <manu@freebsd.org>


Reviewed-by: Kever Yang<kever.yang@rock-chips.com>


Thanks,
- Kever
> ---
>   arch/arm/dts/rk3328-rock64-u-boot.dtsi | 5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
> index 1d441f7124..e5946d2d2d 100644
> --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
> +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
> @@ -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";
Kever Yang Oct. 14, 2019, 9:54 a.m. UTC | #3
On 2019/10/14 下午5:52, Kever Yang wrote:
>
> On 2019/10/9 上午1:59, Emmanuel Vadot wrote:
>> rk3328 can use same-as-spl option so next loaders are loaded from the 
>> same
>> medium.
>> Add the boot order in the rock64 dts otherwise booting from sdcard
>> will result in u-boot looking into the eMMC.
>>
>> Signed-off-by: Emmanuel Vadot <manu@freebsd.org>
>
>
> Reviewed-by: Kever Yang<kever.yang@rock-chips.com>
>
Applied to u-boot-rockchip master.
>
> Thanks,
> - Kever
>> ---
>>   arch/arm/dts/rk3328-rock64-u-boot.dtsi | 5 +++++
>>   1 file changed, 5 insertions(+)
>>
>> diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi 
>> b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
>> index 1d441f7124..e5946d2d2d 100644
>> --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
>> +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
>> @@ -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";
>
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
diff mbox series

Patch

diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
index 1d441f7124..e5946d2d2d 100644
--- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
@@ -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";