riscv: dts: starfive: split out visionfive2 target specific configuration

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@freeshell.de>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
This commit is contained in:
E Shattow
2024-12-31 22:35:57 -08:00
committed by Leo Yu-Chi Liang
parent 178f6ecb21
commit 9c4d760637
6 changed files with 106 additions and 95 deletions

View File

@@ -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@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 {
};
};
};
};

View File

@@ -4,3 +4,4 @@
*/
#include "jh7110-common-u-boot.dtsi"
#include "starfive-visionfive2-binman.dtsi"

View File

@@ -4,3 +4,4 @@
*/
#include "jh7110-common-u-boot.dtsi"
#include "starfive-visionfive2-binman.dtsi"

View File

@@ -4,3 +4,4 @@
*/
#include "jh7110-common-u-boot.dtsi"
#include "starfive-visionfive2-binman.dtsi"

View File

@@ -4,3 +4,4 @@
*/
#include "jh7110-common-u-boot.dtsi"
#include "starfive-visionfive2-binman.dtsi"

View File

@@ -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 {
};
};
};
};