Procházet zdrojové kódy

dubhe: linux-starfive-dev: Update source and added nfs patch

Added config to enable nfs and changed bootargs to nfs path.

Signed-off-by: weiheng.cheng <weiheng.cheng@starfivetech.com>
weiheng.cheng před 1 rokem
rodič
revize
8ef234e114

+ 45 - 0
recipes-kernel/linux/files/defconfig

@@ -144,3 +144,48 @@ CONFIG_KGDB=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
 CONFIG_KGDB_KDB=y
 CONFIG_KDB_KEYBOARD=y
+
+# For NFS to work
+CONFIG_FILE_LOCKING=y
+CONFIG_MULTIUSER=y
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFSD=y
+
+# Added config based on the gmac dma v2 linux branch's defconfig
+CONFIG_RISCV_UNCACHED_OFFSET=0x400000000
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_NETLINK_ACCT=y
+CONFIG_NETFILTER_NETLINK_QUEUE=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_TABLES=y
+CONFIG_NFT_CT=y
+CONFIG_NFT_COMPAT=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=y
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
+CONFIG_NETFILTER_XT_MATCH_MAC=y
+CONFIG_NETFILTER_XT_MATCH_MARK=y
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+CONFIG_NETFILTER_XT_MATCH_SOCKET=y
+CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_STRING=y
+CONFIG_NETFILTER_XT_MATCH_U32=y
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_DUP_IPV4=y
+CONFIG_NFT_FIB_IPV4=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_NETMAP=y
+CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_STMMAC_ETH=y
+CONFIG_STMMAC_SELFTESTS=y
+CONFIG_DWMAC_STARFIVE_PLAT=y
+CONFIG_MARVELL_PHY=y
+CONFIG_CRC16=y
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_DWARF4=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=300

+ 13 - 0
recipes-kernel/linux/files/ext4-ba.patch

@@ -0,0 +1,13 @@
+diff --git a/arch/riscv/boot/dts/starfive/dubhe_fpga.dts b/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
+index 89098aab24d9..0d43a18bd446 100644
+--- a/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
++++ b/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
+@@ -12,7 +12,7 @@ aliases {
+ 	};
+ 
+ 	chosen {
+-		bootargs = "console=ttySIF0,115200 earlycon=sbi";
++		bootargs = "console=ttySIF0,115200 earlycon=sbi root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait";
+ 	};
+ 
+ 	cpus {

+ 13 - 0
recipes-kernel/linux/files/ext4-nfs.patch

@@ -0,0 +1,13 @@
+diff --git a/arch/riscv/boot/dts/starfive/dubhe_fpga.dts b/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
+index 89098aab24d9..0d43a18bd446 100644
+--- a/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
++++ b/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
+@@ -12,7 +12,7 @@ aliases {
+ 	};
+ 
+ 	chosen {
+-		bootargs = "console=ttySIF0,115200 earlycon=sbi";
++		bootargs = "console=ttySIF0,115200 earlycon=sbi root=/dev/nfs rw nfsroot=192.168.153.221:/home/weiheng.cheng/nfsroot,rw,tcp,vers=3  ip=192.168.152.100:192.168.153.221:192.168.152.1:255.255.255.0::eth0:off rootfstype=ext4 rootwait";
+ 	};
+ 
+ 	cpus {

+ 5 - 5
recipes-kernel/linux/linux-starfive-dev.bbappend

@@ -1,19 +1,19 @@
 FORK = "starfive-tech"
-BRANCH = "starfive-5.15-dubhe"
-SRCREV = "2450e7aab40813ceb06e1dfa3112cdf73c5aa519"
+BRANCH = "starfive-5.15-dubhe-gmac-dma-v2"
+SRCREV = "1a0171abd28293e21d3b7f2bbbd521b7fff61dbc"
 
 LINUX_VERSION = "5.15.0"
 LINUX_VERSION_EXTENSION:append = "-starlight"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_TMP_B = "git://git@192.168.110.45/starfive-tech/linux.git;protocol=ssh;branch=${BRANCH} \
+SRC_TMP_B = "git://git@192.168.110.45/leyfoon.tan/linux.git;protocol=ssh;branch=${BRANCH} \
 	   file://defconfig \
-           file://ext4.patch \
+           file://ext4-nfs.patch \
 	   file://ext4_dual_bootargs.patch \
 	   "
 
-SRC_TMP_A = "git://git@192.168.110.45/starfive-tech/linux.git;protocol=ssh;branch=${BRANCH} \
+SRC_TMP_A = "git://git@192.168.110.45/leyfoon.tan/linux.git;protocol=ssh;branch=${BRANCH} \
            file://defconfig \
 	   file://ubifs-single-core.patch \
 	   file://ubifs-dual-core.patch \