瀏覽代碼

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

Updated Starfive Linux Kernel source rev to latest and added ext4 boot arguments patch files.
Signed-off-by: yang.lee <yang.lee@starfivetech.com>
yang.lee 1 年之前
父節點
當前提交
4414274dc8

+ 8 - 3
recipes-kernel/linux/files/defconfig

@@ -40,6 +40,8 @@ CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_SPI_NOR=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_SCSI=y
@@ -81,6 +83,9 @@ CONFIG_GOLDFISH=y
 CONFIG_RPMSG_CHAR=y
 CONFIG_RPMSG_VIRTIO=y
 CONFIG_RESET_CONTROLLER=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_AUTOFS4_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
@@ -107,11 +112,11 @@ CONFIG_NLS_CODEPAGE_1251=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_CRC32C=y
+#CONFIG_CRYPTO=y
+#CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_DEV_VIRTIO=y
-CONFIG_CRC16=y
+#CONFIG_CRC16=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_FS=y
 CONFIG_SOFTLOCKUP_DETECTOR=y

+ 62 - 0
recipes-kernel/linux/files/ext4.patch

@@ -0,0 +1,62 @@
+From 6df5912f654a6025be5f509d9bcd428830311e9c Mon Sep 17 00:00:00 2001
+From: Ley Foon Tan <leyfoon.tan@starfivetech.com>
+Date: Thu, 26 Aug 2021 15:44:47 +0800
+Subject: [PATCH] riscv: starfive: Enable EXT4 rootfs support
+
+Enable EXT4 rootfs support. Ext4 partition is located at SD card's partition 2.
+
+Signed-off-by: Ley Foon Tan <leyfoon.tan@starfivetech.com>
+---
+ arch/riscv/boot/dts/starfive/dubhe_fpga.dts | 2 +-
+ arch/riscv/configs/starfive_dubhe_defconfig | 7 +++----
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/arch/riscv/boot/dts/starfive/dubhe_fpga.dts b/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
+index 73ac5029e3c8..ed0f1cc1e668 100644
+--- a/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
++++ b/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
+@@ -11,7 +11,7 @@
+ 	};
+ 
+ 	chosen {
+-		bootargs = "console=ttySIF0,115200 earlycon=sbi";
++		bootargs = "console=ttySIF0,115200 earlycon=sbi root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait";
+ 	};
+ 
+ 	cpus {
+diff --git a/arch/riscv/configs/starfive_dubhe_defconfig b/arch/riscv/configs/starfive_dubhe_defconfig
+index 8f16be046a3a..b92979f53f73 100644
+--- a/arch/riscv/configs/starfive_dubhe_defconfig
++++ b/arch/riscv/configs/starfive_dubhe_defconfig
+@@ -14,7 +14,6 @@ CONFIG_NAMESPACES=y
+ CONFIG_USER_NS=y
+ CONFIG_CHECKPOINT_RESTORE=y
+ CONFIG_BLK_DEV_INITRD=y
+-CONFIG_INITRAMFS_SOURCE="rootfs.cpio"
+ CONFIG_EXPERT=y
+ CONFIG_SOC_STARFIVE_DUBHE=y
+ CONFIG_SMP=y
+@@ -82,6 +81,9 @@ CONFIG_GOLDFISH=y
+ CONFIG_RPMSG_CHAR=y
+ CONFIG_RPMSG_VIRTIO=y
+ CONFIG_RESET_CONTROLLER=y
++CONFIG_EXT2_FS=y
++CONFIG_EXT3_FS=y
++CONFIG_EXT4_FS_POSIX_ACL=y
+ CONFIG_AUTOFS4_FS=y
+ CONFIG_MSDOS_FS=y
+ CONFIG_VFAT_FS=y
+@@ -108,11 +110,8 @@ CONFIG_NLS_CODEPAGE_1251=y
+ CONFIG_NLS_ASCII=y
+ CONFIG_NLS_ISO8859_1=y
+ CONFIG_NLS_UTF8=y
+-CONFIG_CRYPTO=y
+-CONFIG_CRYPTO_CRC32C=y
+ CONFIG_CRYPTO_USER_API_HASH=y
+ CONFIG_CRYPTO_DEV_VIRTIO=y
+-CONFIG_CRC16=y
+ CONFIG_PRINTK_TIME=y
+ CONFIG_DEBUG_FS=y
+ CONFIG_SOFTLOCKUP_DETECTOR=y
+-- 
+GitLab

+ 13 - 0
recipes-kernel/linux/files/ext4_dual_bootargs.patch

@@ -0,0 +1,13 @@
+diff --git a/arch/riscv/boot/dts/starfive/dubhe_fpga_dual.dts b/arch/riscv/boot/dts/starfive/dubhe_fpga_dual.dts
+index 86d69ea6c73b..527e69bb0798 100644
+--- a/arch/riscv/boot/dts/starfive/dubhe_fpga_dual.dts
++++ b/arch/riscv/boot/dts/starfive/dubhe_fpga_dual.dts
+@@ -11,7 +11,7 @@ aliases {
+ 	};
+ 
+ 	chosen {
+-		bootargs = "console=ttySIF0,115200 earlycon=sbi";
++		bootargs = "console=ttySIF0,115200 earlycon=sbi root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait";
+ 	};
+ 
+ 	cpus {

+ 6 - 3
recipes-kernel/linux/linux-starfive-dev.bbappend

@@ -1,6 +1,7 @@
 FORK = "starfive-tech"
 BRANCH = "starfive-5.15-dubhe"
-SRCREV = "86f3ed476b1034914fe49f2fc83d60ff75003ccc"
+#SRCREV = "86f3ed476b1034914fe49f2fc83d60ff75003ccc"
+SRCREV = "2450e7aab40813ceb06e1dfa3112cdf73c5aa519"
 
 LINUX_VERSION = "5.15.0"
 LINUX_VERSION_EXTENSION:append = "-starlight"
@@ -9,10 +10,12 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI = "git://git@192.168.110.45/starfive-tech/linux.git;protocol=ssh;branch=${BRANCH} \
 	   file://defconfig \
+           file://ext4.patch \
+	   file://ext4_dual_bootargs.patch  \
 	   "
 
-INITRAMFS_IMAGE_BUNDLE = "1"
-INITRAMFS_IMAGE = "dubhe-image-initramfs"
+INITRAMFS_IMAGE_BUNDLE = "${@oe.utils.conditional('ENABLE_EXT4','1','','1',d)}"
+INITRAMFS_IMAGE = "${@oe.utils.conditional('ENABLE_EXT4','1','','dubhe-image-initramfs',d)}"
 
 #KBUILD_DEFCONFIG_starfive = "starfive_dubhe_defconfig"