diff mbox series

[RFC,v2,3/8] soc: rockchip: Include common U-Boot dtsi file

Message ID 20220516110712.178958-4-andrew@mirx.dev
State RFC
Delegated to: Kever Yang
Headers show
Series Build Rockchip final images using binman | expand

Commit Message

Andrew Abbott May 16, 2022, 11:07 a.m. UTC
This pulls in binman definitions so images can be built for all
Rockchip platforms.

Signed-off-by: Andrew Abbott <andrew@mirx.dev>
---

(no changes since v1)

 arch/arm/dts/rk3308-u-boot.dtsi | 2 ++
 arch/arm/dts/rk3328-u-boot.dtsi | 2 ++
 arch/arm/dts/rk3368-u-boot.dtsi | 1 +
 arch/arm/dts/rk3568-u-boot.dtsi | 2 ++
 4 files changed, 7 insertions(+)

Comments

Alper Nebi Yasak May 19, 2022, 11:36 a.m. UTC | #1
On 16/05/2022 14:07, Andrew Abbott wrote:
> This pulls in binman definitions so images can be built for all
> Rockchip platforms.
> 
> Signed-off-by: Andrew Abbott <andrew@mirx.dev>
> ---

See Simon's patch [1] for this, which contains these changes and is more
complete. I think the 'imply BINMAN's there achieve the same thing as
your 'select BINMAN if SPL' in patch 6/8, but I'm not sure which is better.

[1] rockchip: Include binman script in 64-bit boards
https://lore.kernel.org/u-boot/20220306031917.3005215-24-sjg@chromium.org/

> 
> (no changes since v1)
> 
>  arch/arm/dts/rk3308-u-boot.dtsi | 2 ++
>  arch/arm/dts/rk3328-u-boot.dtsi | 2 ++
>  arch/arm/dts/rk3368-u-boot.dtsi | 1 +
>  arch/arm/dts/rk3568-u-boot.dtsi | 2 ++
>  4 files changed, 7 insertions(+)
> 
> diff --git a/arch/arm/dts/rk3308-u-boot.dtsi b/arch/arm/dts/rk3308-u-boot.dtsi
> index 4bfad31fba..ab5bfc2ce9 100644
> --- a/arch/arm/dts/rk3308-u-boot.dtsi
> +++ b/arch/arm/dts/rk3308-u-boot.dtsi
> @@ -3,6 +3,8 @@
>   *(C) Copyright 2019 Rockchip Electronics Co., Ltd
>   */
>  
> +#include "rockchip-u-boot.dtsi"
> +
>  / {
>  	aliases {
>  		mmc0 = &emmc;
> diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
> index 1633558264..d4a7540a92 100644
> --- a/arch/arm/dts/rk3328-u-boot.dtsi
> +++ b/arch/arm/dts/rk3328-u-boot.dtsi
> @@ -3,6 +3,8 @@
>   * (C) Copyright 2019 Rockchip Electronics Co., Ltd
>   */
>  
> +#include "rockchip-u-boot.dtsi"
> +
>  / {
>  	aliases {
>  		mmc0 = &emmc;
> diff --git a/arch/arm/dts/rk3368-u-boot.dtsi b/arch/arm/dts/rk3368-u-boot.dtsi
> index 2767c2678d..b37da4e851 100644
> --- a/arch/arm/dts/rk3368-u-boot.dtsi
> +++ b/arch/arm/dts/rk3368-u-boot.dtsi
> @@ -3,6 +3,7 @@
>   * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH
>   */
>  
> +#include "rockchip-u-boot.dtsi"
>  #include <dt-bindings/memory/rk3368-dmc.h>
>  
>  / {
> diff --git a/arch/arm/dts/rk3568-u-boot.dtsi b/arch/arm/dts/rk3568-u-boot.dtsi
> index 5a80dda275..fa9b6ae23b 100644
> --- a/arch/arm/dts/rk3568-u-boot.dtsi
> +++ b/arch/arm/dts/rk3568-u-boot.dtsi
> @@ -3,6 +3,8 @@
>   * (C) Copyright 2021 Rockchip Electronics Co., Ltd
>   */
>  
> +#include "rockchip-u-boot.dtsi"
> +
>  / {
>  	aliases {
>  		mmc0 = &sdhci;
diff mbox series

Patch

diff --git a/arch/arm/dts/rk3308-u-boot.dtsi b/arch/arm/dts/rk3308-u-boot.dtsi
index 4bfad31fba..ab5bfc2ce9 100644
--- a/arch/arm/dts/rk3308-u-boot.dtsi
+++ b/arch/arm/dts/rk3308-u-boot.dtsi
@@ -3,6 +3,8 @@ 
  *(C) Copyright 2019 Rockchip Electronics Co., Ltd
  */
 
+#include "rockchip-u-boot.dtsi"
+
 / {
 	aliases {
 		mmc0 = &emmc;
diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
index 1633558264..d4a7540a92 100644
--- a/arch/arm/dts/rk3328-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-u-boot.dtsi
@@ -3,6 +3,8 @@ 
  * (C) Copyright 2019 Rockchip Electronics Co., Ltd
  */
 
+#include "rockchip-u-boot.dtsi"
+
 / {
 	aliases {
 		mmc0 = &emmc;
diff --git a/arch/arm/dts/rk3368-u-boot.dtsi b/arch/arm/dts/rk3368-u-boot.dtsi
index 2767c2678d..b37da4e851 100644
--- a/arch/arm/dts/rk3368-u-boot.dtsi
+++ b/arch/arm/dts/rk3368-u-boot.dtsi
@@ -3,6 +3,7 @@ 
  * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH
  */
 
+#include "rockchip-u-boot.dtsi"
 #include <dt-bindings/memory/rk3368-dmc.h>
 
 / {
diff --git a/arch/arm/dts/rk3568-u-boot.dtsi b/arch/arm/dts/rk3568-u-boot.dtsi
index 5a80dda275..fa9b6ae23b 100644
--- a/arch/arm/dts/rk3568-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-u-boot.dtsi
@@ -3,6 +3,8 @@ 
  * (C) Copyright 2021 Rockchip Electronics Co., Ltd
  */
 
+#include "rockchip-u-boot.dtsi"
+
 / {
 	aliases {
 		mmc0 = &sdhci;