[U-Boot] [PATCH 1/2] arm: dts: rock960: Enable booting from eMMC when using SPL
This commits enables booting from eMMC when using SPL on 96Boards Rock960 board by adding SDHCI to boot order. Since the SDHCI driver already has the reloc flag, this works straightaway.
Signed-off-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org --- arch/arm/dts/rk3399-rock960-u-boot.dtsi | 1 + arch/arm/dts/rk3399-rock960.dts | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi index 5256f6d3f2..7fb5072a9b 100644 --- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -3,4 +3,5 @@ * Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com */
+#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-2GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts index 7e06bc97e5..c8b9075c73 100644 --- a/arch/arm/dts/rk3399-rock960.dts +++ b/arch/arm/dts/rk3399-rock960.dts @@ -12,6 +12,8 @@
chosen { stdout-path = "serial2:1500000n8"; + u-boot,spl-boot-order = \ + &sdhci, &sdmmc; }; };
This commits enables booting from eMMC when using SPL on 96Boards Ficus board by adding SDHCI to boot order. Since the SDHCI driver already has the reloc flag, this works straightaway.
Signed-off-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org --- arch/arm/dts/rk3399-ficus-u-boot.dtsi | 1 + arch/arm/dts/rk3399-ficus.dts | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi index eab86bdb30..67b63a8352 100644 --- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi @@ -3,4 +3,5 @@ * Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com */
+#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-ficus.dts b/arch/arm/dts/rk3399-ficus.dts index 4b2dd82b67..0f219f4a9c 100644 --- a/arch/arm/dts/rk3399-ficus.dts +++ b/arch/arm/dts/rk3399-ficus.dts @@ -15,6 +15,8 @@
chosen { stdout-path = "serial2:1500000n8"; + u-boot,spl-boot-order = \ + &sdhci, &sdmmc; };
clkin_gmac: external-gmac-clock {
On 05/20/2019 11:46 PM, Manivannan Sadhasivam wrote:
This commits enables booting from eMMC when using SPL on 96Boards Ficus board by adding SDHCI to boot order. Since the SDHCI driver already has the reloc flag, this works straightaway.
Signed-off-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
arch/arm/dts/rk3399-ficus-u-boot.dtsi | 1 + arch/arm/dts/rk3399-ficus.dts | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi index eab86bdb30..67b63a8352 100644 --- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi @@ -3,4 +3,5 @@
- Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com
*/
+#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-ficus.dts b/arch/arm/dts/rk3399-ficus.dts index 4b2dd82b67..0f219f4a9c 100644 --- a/arch/arm/dts/rk3399-ficus.dts +++ b/arch/arm/dts/rk3399-ficus.dts @@ -15,6 +15,8 @@
chosen { stdout-path = "serial2:1500000n8";
u-boot,spl-boot-order = \&sdhci, &sdmmc;};
clkin_gmac: external-gmac-clock {
On Mon, May 27, 2019 at 02:49:49PM +0800, Kever Yang wrote:
On 05/20/2019 11:46 PM, Manivannan Sadhasivam wrote:
This commits enables booting from eMMC when using SPL on 96Boards Ficus board by adding SDHCI to boot order. Since the SDHCI driver already has the reloc flag, this works straightaway.
Signed-off-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Ping!
Thanks,
- Kever
arch/arm/dts/rk3399-ficus-u-boot.dtsi | 1 + arch/arm/dts/rk3399-ficus.dts | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi index eab86bdb30..67b63a8352 100644 --- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi @@ -3,4 +3,5 @@
- Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com
*/
+#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-ficus.dts b/arch/arm/dts/rk3399-ficus.dts index 4b2dd82b67..0f219f4a9c 100644 --- a/arch/arm/dts/rk3399-ficus.dts +++ b/arch/arm/dts/rk3399-ficus.dts @@ -15,6 +15,8 @@
chosen { stdout-path = "serial2:1500000n8";
u-boot,spl-boot-order = \&sdhci, &sdmmc;};
clkin_gmac: external-gmac-clock {
On Mon, May 20, 2019 at 4:47 PM Manivannan Sadhasivam manivannan.sadhasivam@linaro.org wrote:
This commits enables booting from eMMC when using SPL on 96Boards Ficus board by adding SDHCI to boot order. Since the SDHCI driver already has the reloc flag, this works straightaway.
Signed-off-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org
arch/arm/dts/rk3399-ficus-u-boot.dtsi | 1 + arch/arm/dts/rk3399-ficus.dts | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi index eab86bdb30..67b63a8352 100644 --- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi @@ -3,4 +3,5 @@
- Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com
*/
+#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-ficus.dts b/arch/arm/dts/rk3399-ficus.dts index 4b2dd82b67..0f219f4a9c 100644 --- a/arch/arm/dts/rk3399-ficus.dts +++ b/arch/arm/dts/rk3399-ficus.dts @@ -15,6 +15,8 @@
chosen { stdout-path = "serial2:1500000n8";
u-boot,spl-boot-order = \&sdhci, &sdmmc;
Shouldn't this be in the rk3399-ficus-u-boot.dtsi above? It would get lost with a resync of dts files from linux.
}; clkin_gmac: external-gmac-clock {-- 2.17.1
On 05/20/2019 11:46 PM, Manivannan Sadhasivam wrote:
This commits enables booting from eMMC when using SPL on 96Boards Rock960 board by adding SDHCI to boot order. Since the SDHCI driver already has the reloc flag, this works straightaway.
Signed-off-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
arch/arm/dts/rk3399-rock960-u-boot.dtsi | 1 + arch/arm/dts/rk3399-rock960.dts | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi index 5256f6d3f2..7fb5072a9b 100644 --- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -3,4 +3,5 @@
- Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com
*/
+#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-2GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts index 7e06bc97e5..c8b9075c73 100644 --- a/arch/arm/dts/rk3399-rock960.dts +++ b/arch/arm/dts/rk3399-rock960.dts @@ -12,6 +12,8 @@
chosen { stdout-path = "serial2:1500000n8";
u-boot,spl-boot-order = \&sdhci, &sdmmc;};
On Mon, May 27, 2019 at 02:49:39PM +0800, Kever Yang wrote:
On 05/20/2019 11:46 PM, Manivannan Sadhasivam wrote:
This commits enables booting from eMMC when using SPL on 96Boards Rock960 board by adding SDHCI to boot order. Since the SDHCI driver already has the reloc flag, this works straightaway.
Signed-off-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Ping!
Thanks,
- Kever
arch/arm/dts/rk3399-rock960-u-boot.dtsi | 1 + arch/arm/dts/rk3399-rock960.dts | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi index 5256f6d3f2..7fb5072a9b 100644 --- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -3,4 +3,5 @@
- Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com
*/
+#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-2GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts index 7e06bc97e5..c8b9075c73 100644 --- a/arch/arm/dts/rk3399-rock960.dts +++ b/arch/arm/dts/rk3399-rock960.dts @@ -12,6 +12,8 @@
chosen { stdout-path = "serial2:1500000n8";
u-boot,spl-boot-order = \&sdhci, &sdmmc;};
On Mon, May 20, 2019 at 4:47 PM Manivannan Sadhasivam manivannan.sadhasivam@linaro.org wrote:
This commits enables booting from eMMC when using SPL on 96Boards Rock960 board by adding SDHCI to boot order. Since the SDHCI driver already has the reloc flag, this works straightaway.
Signed-off-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org
arch/arm/dts/rk3399-rock960-u-boot.dtsi | 1 + arch/arm/dts/rk3399-rock960.dts | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi index 5256f6d3f2..7fb5072a9b 100644 --- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -3,4 +3,5 @@
- Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com
*/
+#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-2GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts index 7e06bc97e5..c8b9075c73 100644 --- a/arch/arm/dts/rk3399-rock960.dts +++ b/arch/arm/dts/rk3399-rock960.dts @@ -12,6 +12,8 @@
chosen { stdout-path = "serial2:1500000n8";
u-boot,spl-boot-order = \&sdhci, &sdmmc;
Shouldn't this bit be in the rk3399-rock960-u-boot.dtsi not rk3399-rock960.dts because it's U-Boot specific?
};};
-- 2.17.1
Hi Manivannan,
On 2019/7/24 下午3:59, Peter Robinson wrote:
On Mon, May 20, 2019 at 4:47 PM Manivannan Sadhasivam manivannan.sadhasivam@linaro.org wrote:
This commits enables booting from eMMC when using SPL on 96Boards Rock960 board by adding SDHCI to boot order. Since the SDHCI driver already has the reloc flag, this works straightaway.
Signed-off-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org
arch/arm/dts/rk3399-rock960-u-boot.dtsi | 1 + arch/arm/dts/rk3399-rock960.dts | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi index 5256f6d3f2..7fb5072a9b 100644 --- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -3,4 +3,5 @@
- Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com
*/
+#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-2GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts index 7e06bc97e5..c8b9075c73 100644 --- a/arch/arm/dts/rk3399-rock960.dts +++ b/arch/arm/dts/rk3399-rock960.dts @@ -12,6 +12,8 @@
chosen { stdout-path = "serial2:1500000n8";
u-boot,spl-boot-order = \&sdhci, &sdmmc;Shouldn't this bit be in the rk3399-rock960-u-boot.dtsi not rk3399-rock960.dts because it's U-Boot specific?
Peter is correct, all the update to dts by U-Boot should go to -u-boot.dtsi now,
could you update and send the patch again?
Thanks, - Kever
};};
-- 2.17.1
Hi Peter,
On 24 July 2019 1:29:27 PM IST, Peter Robinson pbrobinson@gmail.com wrote:
On Mon, May 20, 2019 at 4:47 PM Manivannan Sadhasivam manivannan.sadhasivam@linaro.org wrote:
This commits enables booting from eMMC when using SPL on 96Boards Rock960 board by adding SDHCI to boot order. Since the SDHCI driver already has the reloc flag, this works straightaway.
Signed-off-by: Manivannan Sadhasivam
manivannan.sadhasivam@linaro.org
arch/arm/dts/rk3399-rock960-u-boot.dtsi | 1 + arch/arm/dts/rk3399-rock960.dts | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi
b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
index 5256f6d3f2..7fb5072a9b 100644 --- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -3,4 +3,5 @@
- Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com
*/
+#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-2GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-rock960.dts
b/arch/arm/dts/rk3399-rock960.dts
index 7e06bc97e5..c8b9075c73 100644 --- a/arch/arm/dts/rk3399-rock960.dts +++ b/arch/arm/dts/rk3399-rock960.dts @@ -12,6 +12,8 @@
chosen { stdout-path = "serial2:1500000n8";
u-boot,spl-boot-order = \&sdhci, &sdmmc;Shouldn't this bit be in the rk3399-rock960-u-boot.dtsi not rk3399-rock960.dts because it's U-Boot specific?
Good catch! Will fix this and send next revision.
Thanks, Mani
};};
-- 2.17.1
participants (3)
-
Kever Yang -
Manivannan Sadhasivam -
Peter Robinson