[PATCH v1] riscv: dts: starfive: split out visionfive2 target specific configuration
Anand Moon
linux.amoon at gmail.com
Thu Jan 16 20:19:21 CET 2025
Hi E Shattow,
On Wed, 1 Jan 2025 at 12:07, E Shattow <e at freeshell.de> wrote:
>
> Split out StarFive VisionFive2 multi-board target specific configuration
> into starfive-visionfive2-binman.dtsi in preparation for removal of
> jh7110-u-boot and jh7110-common-u-boot in part or whole as sent upstream.
>
> Signed-off-by: E Shattow <e at freeshell.de>
> ---
> arch/riscv/dts/jh7110-common-u-boot.dtsi | 95 ----------------
> arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi | 1 +
> .../dts/jh7110-pine64-star64-u-boot.dtsi | 1 +
> ...10-starfive-visionfive-2-v1.2a-u-boot.dtsi | 1 +
> ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi | 1 +
> .../dts/starfive-visionfive2-binman.dtsi | 102 ++++++++++++++++++
> 6 files changed, 106 insertions(+), 95 deletions(-)
> create mode 100644 arch/riscv/dts/starfive-visionfive2-binman.dtsi
>
> diff --git a/arch/riscv/dts/jh7110-common-u-boot.dtsi b/arch/riscv/dts/jh7110-common-u-boot.dtsi
> index 7871294e90d..6d85b2d91a7 100644
> --- a/arch/riscv/dts/jh7110-common-u-boot.dtsi
> +++ b/arch/riscv/dts/jh7110-common-u-boot.dtsi
> @@ -3,7 +3,6 @@
> * Copyright (C) 2023 StarFive Technology Co., Ltd.
> */
>
> -#include "binman.dtsi"
> #include "jh7110-u-boot.dtsi"
> / {
> aliases {
> @@ -19,11 +18,6 @@
> bootph-pre-ram;
> };
>
> - config {
> - bootph-pre-ram;
> - u-boot,spl-payload-offset = <0x100000>;
> - };
> -
> memory at 40000000 {
> bootph-pre-ram;
> };
> @@ -104,92 +98,3 @@
> pagesize = <16>;
> };
> };
> -
> -&binman {
> - itb {
> - fit {
> - images {
> - fdt-jh7110-milkv-mars {
> - description = "jh7110-milkv-mars";
> - load = <0x40400000>;
> - compression = "none";
> -
> - blob-ext {
> - filename = "dts/upstream/src/riscv/starfive/jh7110-milkv-mars.dtb";
> - };
> - };
> -
> - fdt-jh7110-pine64-star64 {
> - description = "jh7110-pine64-star64";
> - load = <0x40400000>;
> - compression = "none";
> -
> - blob-ext {
> - filename = "dts/upstream/src/riscv/starfive/jh7110-pine64-star64.dtb";
> - };
> - };
> -
> - fdt-jh7110-starfive-visionfive-2-v1.2a {
> - description = "jh7110-starfive-visionfive-2-v1.2a";
> - load = <0x40400000>;
> - compression = "none";
> -
> - blob-ext {
> - filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.2a.dtb";
> - };
> - };
> -
> - fdt-jh7110-starfive-visionfive-2-v1.3b {
> - description = "jh7110-starfive-visionfive-2-v1.3b";
> - load = <0x40400000>;
> - compression = "none";
> -
> - blob-ext {
> - filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb";
> - };
> - };
> - };
> -
> - configurations {
> - conf-jh7110-milkv-mars {
> - description = "jh7110-milkv-mars";
> - firmware = "opensbi";
> - loadables = "uboot";
> - fdt = "fdt-jh7110-milkv-mars";
> - };
> -
> - conf-jh7110-pine64-star64 {
> - description = "jh7110-pine64-star64";
> - firmware = "opensbi";
> - loadables = "uboot";
> - fdt = "fdt-jh7110-pine64-star64";
> - };
> -
> - conf-jh7110-starfive-visionfive-2-v1.2a {
> - description = "jh7110-starfive-visionfive-2-v1.2a";
> - firmware = "opensbi";
> - loadables = "uboot";
> - fdt = "fdt-jh7110-starfive-visionfive-2-v1.2a";
> - };
> -
> - conf-jh7110-starfive-visionfive-2-v1.3b {
> - description = "jh7110-starfive-visionfive-2-v1.3b";
> - firmware = "opensbi";
> - loadables = "uboot";
> - fdt = "fdt-jh7110-starfive-visionfive-2-v1.3b";
> - };
> - };
> - };
> - };
> -
> - spl-img {
> - filename = "spl/u-boot-spl.bin.normal.out";
> -
> - mkimage {
> - args = "-T sfspl";
> -
> - u-boot-spl {
> - };
> - };
> - };
> -};
> diff --git a/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi b/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi
> index 9df1e5db553..ab882d07f6f 100644
> --- a/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi
> +++ b/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi
> @@ -4,3 +4,4 @@
> */
>
> #include "jh7110-common-u-boot.dtsi"
> +#include "starfive-visionfive2-binman.dtsi"
> diff --git a/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi b/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi
> index 9df1e5db553..ab882d07f6f 100644
> --- a/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi
> +++ b/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi
> @@ -4,3 +4,4 @@
> */
>
> #include "jh7110-common-u-boot.dtsi"
> +#include "starfive-visionfive2-binman.dtsi"
> diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi
> index 9df1e5db553..ab882d07f6f 100644
> --- a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi
> +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi
> @@ -4,3 +4,4 @@
> */
>
> #include "jh7110-common-u-boot.dtsi"
> +#include "starfive-visionfive2-binman.dtsi"
> diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi
> index e6bc6630dcd..874074174ff 100644
> --- a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi
> +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi
> @@ -4,3 +4,4 @@
> */
>
> #include "jh7110-common-u-boot.dtsi"
> +#include "starfive-visionfive2-binman.dtsi"
> diff --git a/arch/riscv/dts/starfive-visionfive2-binman.dtsi b/arch/riscv/dts/starfive-visionfive2-binman.dtsi
> new file mode 100644
> index 00000000000..4cce001e80d
> --- /dev/null
> +++ b/arch/riscv/dts/starfive-visionfive2-binman.dtsi
> @@ -0,0 +1,102 @@
> +// SPDX-License-Identifier: GPL-2.0 OR MIT
> +/*
> + * Copyright (C) 2023 StarFive Technology Co., Ltd.
> + */
> +
> +#include "binman.dtsi"
> +
> +/ {
> + config {
> + bootph-pre-ram;
> + u-boot,spl-payload-offset = <0x100000>;
> + };
> +};
> +
> +&binman {
> + itb {
> + fit {
> + images {
> + fdt-jh7110-milkv-mars {
> + description = "jh7110-milkv-mars";
> + load = <0x40400000>;
> + compression = "none";
> +
> + blob-ext {
> + filename = "dts/upstream/src/riscv/starfive/jh7110-milkv-mars.dtb";
> + };
> + };
> +
> + fdt-jh7110-pine64-star64 {
> + description = "jh7110-pine64-star64";
> + load = <0x40400000>;
> + compression = "none";
> +
> + blob-ext {
> + filename = "dts/upstream/src/riscv/starfive/jh7110-pine64-star64.dtb";
> + };
> + };
> +
> + fdt-jh7110-starfive-visionfive-2-v1.2a {
> + description = "jh7110-starfive-visionfive-2-v1.2a";
> + load = <0x40400000>;
> + compression = "none";
> +
> + blob-ext {
> + filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.2a.dtb";
> + };
> + };
> +
> + fdt-jh7110-starfive-visionfive-2-v1.3b {
> + description = "jh7110-starfive-visionfive-2-v1.3b";
> + load = <0x40400000>;
> + compression = "none";
> +
> + blob-ext {
> + filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb";
> + };
> + };
> + };
> +
> + configurations {
> + conf-jh7110-milkv-mars {
> + description = "jh7110-milkv-mars";
> + firmware = "opensbi";
> + loadables = "uboot";
> + fdt = "fdt-jh7110-milkv-mars";
> + };
> +
> + conf-jh7110-pine64-star64 {
> + description = "jh7110-pine64-star64";
> + firmware = "opensbi";
> + loadables = "uboot";
> + fdt = "fdt-jh7110-pine64-star64";
> + };
> +
> + conf-jh7110-starfive-visionfive-2-v1.2a {
> + description = "jh7110-starfive-visionfive-2-v1.2a";
> + firmware = "opensbi";
> + loadables = "uboot";
> + fdt = "fdt-jh7110-starfive-visionfive-2-v1.2a";
> + };
> +
> + conf-jh7110-starfive-visionfive-2-v1.3b {
> + description = "jh7110-starfive-visionfive-2-v1.3b";
> + firmware = "opensbi";
> + loadables = "uboot";
> + fdt = "fdt-jh7110-starfive-visionfive-2-v1.3b";
> + };
> + };
> + };
> + };
> +
> + spl-img {
> + filename = "spl/u-boot-spl.bin.normal.out";
> +
> + mkimage {
> + args = "-T sfspl";
> +
> + u-boot-spl {
> + };
> + };
> + };
> +};
>
Reviewed-by: Anand Moon <linux.amoon at gmail.com>
Thanks
-Anand
> base-commit: 43cae09eabf398ede30fd4ed1664e2ee6c447d34
> --
> 2.45.2
>
More information about the U-Boot
mailing list