瀏覽代碼

dubhe: linux-starfive-dev: Update kernel version and recipe

Update linux kernel from version 5.15.0 to 6.1.20 and added conditional arguments for different image build.

Signed-off-by: yang.lee <yang.lee@starfivetech.com>
yang.lee 1 年之前
父節點
當前提交
037cefc5a2

+ 1 - 0
recipes-kernel/linux/files/cpio.cfg

@@ -0,0 +1 @@
+# CONFIG_INITRAMFS_SOURCE is not set

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

@@ -1,192 +0,0 @@
-CONFIG_DEFAULT_HOSTNAME="StarFive"
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_CGROUP_BPF=y
-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_KALLSYMS_ALL=y
-CONFIG_PERF_EVENTS=y
-CONFIG_SOC_STARFIVE_DUBHE=y
-CONFIG_SMP=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_HZ_10=y
-#CONFIG_VECTOR=y
-# CONFIG_EFI is not set
-CONFIG_JUMP_LABEL=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_NETLINK_DIAG=y
-CONFIG_NET_9P=y
-CONFIG_NET_9P_VIRTIO=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_SCSI_VIRTIO=y
-CONFIG_NETDEVICES=y
-CONFIG_VIRTIO_NET=y
-CONFIG_MACB=y
-CONFIG_MICROSEMI_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
-CONFIG_HVC_RISCV_SBI=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_VIRTIO=y
-CONFIG_SPI=y
-CONFIG_SPI_SIFIVE=y
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_SYSCON=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_DRM=y
-CONFIG_DRM_VIRTIO_GPU=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-CONFIG_MMC_SPI=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_GOLDFISH=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_INPUT=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_GOLDFISH=y
-CONFIG_RPMSG_CHAR=y
-CONFIG_RPMSG_VIRTIO=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_UTF8=y
-CONFIG_EXFAT_FS=y
-CONFIG_NTFS_FS=y
-CONFIG_NTFS_DEBUG=y
-CONFIG_NTFS_RW=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_HUGETLBFS=y
-# CONFIG_MISC_FILESYSTEMS is not set
-CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_ROOT_NFS=y
-CONFIG_9P_FS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_936=y
-CONFIG_NLS_CODEPAGE_950=y
-CONFIG_NLS_CODEPAGE_1250=y
-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_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
-
-# 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.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 3e0e0c1c79a2..ac26f80ed702 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 ip=::192.168.152.1:255.255.255.0::eth0:dhcp";
++		bootargs = "console=ttySIF0,115200 earlycon=sbi root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ip=::192.168.152.1:255.255.255.0::eth0:dhcp";
+ 	};
+ 
+ 	cpus {

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

@@ -1,13 +0,0 @@
-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 root=/dev/nfs nfsroot=192.168.153.221:/home/nfsroot,rw,tcp,vers=3 ip=192.168.152.100:192.168.153.221:192.168.152.1:255.255.255.0::eth0:off";
-+		bootargs = "console=ttySIF0,115200 earlycon=sbi";
- 	};
- 
- 	cpus {

+ 13 - 0
recipes-kernel/linux/files/ubi.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 3e0e0c1c79a2..db68c11b73bd 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 ip=::192.168.152.1:255.255.255.0::eth0:dhcp";
++		bootargs = "console=ttySIF0,115200 earlycon=sbi ip=::192.168.152.1:255.255.255.0::eth0:dhcp root=ubi0:starfive-dubhe-rootfs ubi.mtd=1 rw rootfstype=ubifs rootwait";
+ 	};
+ 
+ 	cpus {

+ 11 - 10
recipes-kernel/linux/linux-starfive-dev.bbappend

@@ -1,23 +1,24 @@
 FORK = "starfive-tech"
-BRANCH = "starfive-5.15-dubhe"
-SRCREV = "2eba892dd9f73866999c19339a320f5e98068aeb"
+BRANCH = "starfive-6.1-dubhe"
+SRCREV = "0328291313ba8ad2cd6ac94df9039f2f4a365b6f"
 
-LINUX_VERSION = "5.15.0"
-LINUX_VERSION_EXTENSION:append = "-starlight"
+LINUX_VERSION = "6.1.20"
+LINUX_VERSION_EXTENSTION:append = "-starlight"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI = "git://github.com/starfive-tech/linux.git;protocol=https;branch=${BRANCH} \
-           file://defconfig \
+SRC_URI = "git://git@192.168.110.45/starfive-tech/linux.git;protocol=ssh;branch=${BRANCH} \
+	   file://cpio.cfg \
            "
 
-INITRAMFS_IMAGE_BUNDLE = "${@oe.utils.conditional('ENABLE_NFS','1','','1',d)}"
-INITRAMFS_IMAGE = "${@oe.utils.conditional('ENABLE_NFS','1','','dubhe-image-initramfs',d)}"
+INITRAMFS_IMAGE_BUNDLE = "${@oe.utils.conditional('ENABLE_INIT','1','1','',d)}"
+INITRAMFS_IMAGE = "${@oe.utils.conditional('ENABLE_INIT','1','dubhe-image-initramfs','',d)}"
 
 # Temporary remove the patch to update the kernel, will create new patches after that
-#SRC_URI:append = "${@oe.utils.conditional('ENABLE_NFS','1','file://nfs.patch','file://initramfs.patch',d)}"
+SRC_URI:append = "${@oe.utils.conditional('ENABLE_EXT4','1','file://ext4.patch','',d)}"
+SRC_URI:append = "${@oe.utils.conditional('ENABLE_UBI','1','file://ubi.patch','',d)}"
 
-#KBUILD_DEFCONFIG_starfive = "starfive_dubhe_defconfig"
+KBUILD_DEFCONFIG:starfive-dubhe = "starfive_dubhe_defconfig"
 
 COMPATIBLE_MACHINE = "(starfive-dubhe)"