Przeglądaj źródła

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

Updated Starfive Linux Kernel source rev to latest and added ubifs boot arguments patch files.

Signed-off-by: yang.lee <yang.lee@starfivetech.com>
yang.lee 1 rok temu
rodzic
commit
7adbee4c94

+ 34 - 12
recipes-kernel/linux/files/defconfig

@@ -16,11 +16,12 @@ CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_BLK_DEV_INITRD=y
 #CONFIG_INITRAMFS_SOURCE="rootfs.cpio"
 CONFIG_EXPERT=y
+#CONFIG_KALLSYMS_ALL=y
 CONFIG_PERF_EVENTS=y
 CONFIG_SOC_STARFIVE_DUBHE=y
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
-CONFIG_VECTOR=y
+#CONFIG_VECTOR=y
 # CONFIG_EFI is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
@@ -40,8 +41,6 @@ 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
@@ -83,9 +82,6 @@ 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
@@ -112,13 +108,39 @@ 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
-CONFIG_WQ_WATCHDOG=y
+#CONFIG_DEBUG_INFO=y
+CONFIG_READABLE_ASM=y
+#CONFIG_DEBUG_FS=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=300
 # CONFIG_RCU_TRACE is not set
+CONFIG_MTD=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_SPI_MASTER=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_BLOCK2MTD=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_UBIFS_FS=y
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=n
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=262144
+CONFIG_MTDRAM_ERASE_SIZE=64
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_FRAME_POINTER=y
+CONFIG_KGDB=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_KEYBOARD=y

+ 62 - 0
recipes-kernel/linux/files/ubifs-dual-core.patch

@@ -0,0 +1,62 @@
+diff --git a/arch/riscv/boot/dts/starfive/dubhe_fpga_dual.dts b/arch/riscv/boot/dts/starfive/dubhe_fpga_dual.dts
+index 527e69bb0798..5a22cc0b30ad 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=ubi0:starfive-dubhe-rootfs ubi.mtd=4 rw rootfstype=ubifs rootwait";
+ 	};
+ 
+ 	cpus {
+@@ -40,6 +40,48 @@ mmc@0 {
+ 
+ &qspi1 {
+ 	status = "okay";
++
++	flash@0 {
++                compatible = "jedec,spi-nor";
++                reg = <0>;
++                spi-max-frequency = <20000000>;
++                m25p,fast-read;
++                spi-tx-bus-width = <1>;
++                spi-rx-bus-width = <1>;
++
++                partitions {
++			compatible = "fixed-partitions";
++			#address-cells = <1>;
++			#size-cells = <1>;
++
++			partition@0 {
++				reg = <0x000000 0x10000>;
++				label = "boot copier";
++				/*read-only;*/
++			};
++
++			partition@10000 {
++				reg = <0x10000 0x10000>;
++				label = "boot jump";
++				/*read-only;*/
++			};
++
++			partition@20000 {
++				reg = <0x20000 0x10000>;
++				label = "DTB";
++			};
++
++			partition@30000 {
++				reg = <0x30000 0x1700000>;
++				label = "FW_payload (OpenSBI and Linux)";
++			};
++
++			partition@1730000 {
++				reg = <0x1730000 0x68D0000>;
++				label = "Rootfs";
++			};
++		};
++        };
+ };
+ 
+ &uart0 {

+ 63 - 0
recipes-kernel/linux/files/ubifs-single-core.patch

@@ -0,0 +1,63 @@
+diff --git a/arch/riscv/boot/dts/starfive/dubhe_fpga.dts b/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
+index 27de8b56bdfd..6f01d9b1c7ac 100644
+--- a/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
++++ b/arch/riscv/boot/dts/starfive/dubhe_fpga.dts
+@@ -11,7 +11,7 @@ aliases {
+ 	};
+ 
+ 	chosen {
+-		bootargs = "console=ttySIF0,115200 earlycon=sbi";
++		bootargs = "console=ttySIF0,115200 earlycon=sbi root=ubi0:starfive-dubhe-rootfs ubi.mtd=4 rw rootfstype=ubifs rootwait";
+ 	};
+ 
+ 	cpus {
+@@ -41,6 +41,49 @@ mmc@0 {
+ 
+ &qspi1 {
+ 	status = "okay";
++
++	flash@0 {
++                compatible = "jedec,spi-nor";
++                reg = <0>;
++                spi-max-frequency = <20000000>;
++                m25p,fast-read;
++                spi-tx-bus-width = <1>;
++                spi-rx-bus-width = <1>;
++
++                partitions {
++			compatible = "fixed-partitions";
++			#address-cells = <1>;
++			#size-cells = <1>;
++
++			partition@0 {
++				reg = <0x000000 0x10000>;
++				label = "boot copier";
++				/*read-only;*/
++			};
++
++			partition@10000 {
++				reg = <0x10000 0x10000>;
++				label = "boot jump";
++				/*read-only;*/
++			};
++
++			partition@20000 {
++				reg = <0x20000 0x10000>;
++				label = "DTB";
++			};
++
++			partition@30000 {
++				reg = <0x30000 0x1700000>;
++				label = "FW_payload (OpenSBI and Linux)";
++			};
++
++			partition@1730000 {
++				reg = <0x1730000 0x68D0000>;
++				label = "Rootfs";
++			};
++		};
++        };
++
+ };
+ 
+ &uart0 {

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

@@ -1,6 +1,5 @@
 FORK = "starfive-tech"
 BRANCH = "starfive-5.15-dubhe"
-#SRCREV = "86f3ed476b1034914fe49f2fc83d60ff75003ccc"
 SRCREV = "2450e7aab40813ceb06e1dfa3112cdf73c5aa519"
 
 LINUX_VERSION = "5.15.0"
@@ -8,18 +7,28 @@ LINUX_VERSION_EXTENSION:append = "-starlight"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI = "git://git@192.168.110.45/starfive-tech/linux.git;protocol=ssh;branch=${BRANCH} \
+SRC_TMP_B = "git://git@192.168.110.45/starfive-tech/linux.git;protocol=ssh;branch=${BRANCH} \
 	   file://defconfig \
            file://ext4.patch \
-	   file://ext4_dual_bootargs.patch  \
+	   file://ext4_dual_bootargs.patch \
 	   "
 
+SRC_TMP_A = "git://git@192.168.110.45/starfive-tech/linux.git;protocol=ssh;branch=${BRANCH} \
+           file://defconfig \
+	   file://ubifs-single-core.patch \
+	   file://ubifs-dual-core.patch \
+           "
+
 INITRAMFS_IMAGE_BUNDLE = "${@oe.utils.conditional('ENABLE_EXT4','1','','1',d)}"
 INITRAMFS_IMAGE = "${@oe.utils.conditional('ENABLE_EXT4','1','','dubhe-image-initramfs',d)}"
 
+SRC_URI = "${@oe.utils.conditional('ENABLE_UBI','1','${SRC_TMP_A}','${SRC_TMP_B}',d)}"
+
 #KBUILD_DEFCONFIG_starfive = "starfive_dubhe_defconfig"
 
 COMPATIBLE_MACHINE = "(starfive-dubhe)"
 
 #FILES:${PN} += "${exec_prefix} ${libdir} ${libdir}/debug ${libdir}/debug/boot ${libdir}/debug/boot/*.debug"
 FILES:${KERNEL_PACKAGE_NAME}-base += "/usr/*"
+
+do_compile[nostamp] = "1"