From af14883d1a5cbeeed4bd29321d835dcfb2806b96 Mon Sep 17 00:00:00 2001 From: "yang.wang" Date: Wed, 8 Jan 2025 16:18:16 +0800 Subject: [PATCH] The configuration file that uses FML13V01 by default. Signed-off-by: yang.wang --- Makefile | 2 +- conf/visionfive2-fit-image.its | 2 +- linux | 2 +- u-boot | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ed7f07b..b2f90d1 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ linux_wrkdir := $(wrkdir)/linux ifeq ($(HWBOARD), evb) linux_defconfig := $(linux_srcdir)/arch/riscv/configs/starfive_jh7110_defconfig else - linux_defconfig := $(linux_srcdir)/arch/riscv/configs/starfive_visionfive2_defconfig + linux_defconfig := $(linux_srcdir)/arch/riscv/configs/fml13v01_defconfig endif vmlinux := $(linux_wrkdir)/vmlinux diff --git a/conf/visionfive2-fit-image.its b/conf/visionfive2-fit-image.its index 7c01d91..bc1dcbd 100644 --- a/conf/visionfive2-fit-image.its +++ b/conf/visionfive2-fit-image.its @@ -30,7 +30,7 @@ }; fdt { - data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"); + data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-fml13v01.dtb"); type = "flat_dt"; arch = "riscv"; load = <0x0 0x46000000>; diff --git a/linux b/linux index 9dd55a9..16d3ad4 160000 --- a/linux +++ b/linux @@ -1 +1 @@ -Subproject commit 9dd55a98abe30f929113e6295bf1c65956af9b97 +Subproject commit 16d3ad47faa86d9045fae73ea74bc9f020ba85de diff --git a/u-boot b/u-boot index 692c8f5..e1a91d4 160000 --- a/u-boot +++ b/u-boot @@ -1 +1 @@ -Subproject commit 692c8f5c7af24e21af214cba50ed86e78d05d6fa +Subproject commit e1a91d43cbc324f92d84f7d013bb18da2139d43a