On 11/11/2024 5:56 PM, Heinrich Schuchardt wrote:
> On 11/11/24 03:07, Hal Feng wrote:
>> 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.f...@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
>
> IIRC the imply statement should be sorted in the sequence of appearance
> in .config to avoid dependency issues. In a follow up patch to this
> series you might want to sort the whole list of imply statements
> accordingly.
>
> Reviewed-by: Heinrich Schuchardt <xypron.g...@gmx.de>
OK, will add a new patch to sort this list in the next version.
Thanks for your review.
Best regards,
Hal
>
>> 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 11e1332f87..40f553816e 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
>
>
