From: Hal Feng <hal.feng@starfivetech.com>
To: Leo <ycliang@andestech.com>, Tom Rini <trini@konsulko.com>,
Sumit Garg <sumit.garg@linaro.org>,
Rick Chen <rick@andestech.com>,
Heinrich Schuchardt <xypron.glpk@gmx.de>,
H Bell <dmoo_dv@protonmail.com>, E Shattow <lucent@gmail.com>,
Nam Cao <namcao@linutronix.de>, Bo Gan <ganboing@gmail.com>
Cc: Emil Renner Berthing <emil.renner.berthing@canonical.com>,
Minda Chen <minda.chen@starfivetech.com>,
Hal Feng <hal.feng@starfivetech.com>,
u-boot@lists.denx.de
Subject: [PATCH v1 02/12] dts: starfive: Switch to using upstream DT
Date: Mon, 30 Sep 2024 23:59:09 +0800 [thread overview]
Message-ID: <20240930155919.111738-3-hal.feng@starfivetech.com> (raw)
In-Reply-To: <20240930155919.111738-1-hal.feng@starfivetech.com>
Enable OF_UPSTREAM to use upstream DT and add starfive/ prefix to
the DEFAULT_DEVICE_TREE. Rename jh7110-starfive-visionfive-2-u-boot.dtsi
to jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi and set
the v1.3b device tree as the default device tree.
Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
---
arch/riscv/cpu/jh7110/Kconfig | 1 +
...boot.dtsi => jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi} | 0
configs/starfive_visionfive2_defconfig | 2 +-
3 files changed, 2 insertions(+), 1 deletion(-)
rename arch/riscv/dts/{jh7110-starfive-visionfive-2-u-boot.dtsi => jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi} (100%)
diff --git a/arch/riscv/cpu/jh7110/Kconfig b/arch/riscv/cpu/jh7110/Kconfig
index e5549a01b8..9904a60ddd 100644
--- a/arch/riscv/cpu/jh7110/Kconfig
+++ b/arch/riscv/cpu/jh7110/Kconfig
@@ -19,6 +19,7 @@ config STARFIVE_JH7110
imply MMC
imply MMC_BROKEN_CD
imply MMC_SPI
+ imply OF_UPSTREAM
imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE)
imply SIFIVE_CACHE
imply SIFIVE_CCACHE
diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi
similarity index 100%
rename from arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi
rename to arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi
diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig
index 174ac24dc7..0068ea4d93 100644
--- a/configs/starfive_visionfive2_defconfig
+++ b/configs/starfive_visionfive2_defconfig
@@ -9,7 +9,7 @@ CONFIG_SF_DEFAULT_SPEED=100000000
CONFIG_ENV_SIZE=0x10000
CONFIG_ENV_OFFSET=0xf0000
CONFIG_SPL_DM_SPI=y
-CONFIG_DEFAULT_DEVICE_TREE="jh7110-starfive-visionfive-2"
+CONFIG_DEFAULT_DEVICE_TREE="starfive/jh7110-starfive-visionfive-2-v1.3b"
CONFIG_SPL_TEXT_BASE=0x8000000
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_DM_RESET=y
--
2.43.2
next prev parent reply other threads:[~2024-09-30 17:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-30 15:59 [PATCH v1 00/12] Support OF_UPSTREAM for StarFive JH7110 Hal Feng
2024-09-30 15:59 ` [PATCH v1 01/12] Makefile: Add OF_UPSTREAM Makefile for RISC-V Hal Feng
2024-09-30 15:59 ` Hal Feng [this message]
2024-09-30 15:59 ` [PATCH v1 03/12] riscv: dts: jh7110: Drop redundant devicetree files Hal Feng
2024-09-30 15:59 ` [PATCH v1 04/12] dt-bindings: Remove StarFive JH7110 clock and reset definitions Hal Feng
2024-09-30 15:59 ` [PATCH v1 05/12] riscv: dts: jh7110: Make u-boot device trees adapting to upstream DT Hal Feng
2024-09-30 15:59 ` [PATCH v1 06/12] clk: starfive: jh7110: Sync clock definitions with upstream dt-bindings Hal Feng
2024-09-30 15:59 ` [PATCH v1 07/12] pcie: starfive: Make the driver compatible with upstream DT Hal Feng
2024-09-30 15:59 ` [PATCH v1 08/12] riscv: dts: jh7110: Move common code to the new jh7110-common-u-boot.dtsi Hal Feng
2024-09-30 15:59 ` [PATCH v1 09/12] riscv: dts: jh7110: Add u-boot device tree for JH7110 based boards Hal Feng
2024-09-30 15:59 ` [PATCH v1 10/12] board: starfive: spl: Drop the unneeded DT modification code Hal Feng
2024-09-30 15:59 ` [PATCH v1 11/12] configs: visionfive2: Add OF_LIST for JH7110 based board DT Hal Feng
2024-09-30 15:59 ` [PATCH v1 12/12] doc: board: starfive: Update the building guide Hal Feng
2024-09-30 17:55 ` [PATCH v1 00/12] Support OF_UPSTREAM for StarFive JH7110 Heinrich Schuchardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240930155919.111738-3-hal.feng@starfivetech.com \
--to=hal.feng@starfivetech.com \
--cc=dmoo_dv@protonmail.com \
--cc=emil.renner.berthing@canonical.com \
--cc=ganboing@gmail.com \
--cc=lucent@gmail.com \
--cc=minda.chen@starfivetech.com \
--cc=namcao@linutronix.de \
--cc=rick@andestech.com \
--cc=sumit.garg@linaro.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.de \
--cc=ycliang@andestech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox