Browse Source

dubhe: Added perf support

Updated Linux Kernel and openSBI branches to support perf in the default
Yocto image build. Linux defconfigs were also updated. Due to the change of
size of the device tree, the boot code was also updated.

Signed-off-by: Jun Yuan Tan <junyuan.tan@starfivetech.com>
Jun Yuan Tan 2 years ago
parent
commit
5adbad4618

+ 3 - 0
conf/machine/starfive-dubhe.conf

@@ -6,6 +6,9 @@
 LLVMVERSION = "14.0.0"
 CLANGSDK = "1"
 EXTRA_IMAGEDEPENDS:append = " llvm"
+EXTRA_IMAGE_FEATURES:append = " dbg-pkgs tools-profile"
+
+PACKAGE_DEBUG_SPLIT_STYLE = 'debug-file-directory'
 
 #require conf/machine/include/qemu.inc
 # qemuboot options

BIN
recipes-bsp/deploy-bootfiles/files/bootcode.bin


+ 2 - 2
recipes-bsp/opensbi/opensbi_0.9.bbappend

@@ -1,5 +1,5 @@
-SRC_URI = "git://git@192.168.110.45/starfive-tech/opensbi.git;protocol=ssh;branch=starfive-dubhe"
-SRCREV = "b44fd539c9ac9a53f248986a5cb4c9becf84e08d"
+SRC_URI = "git://git@192.168.110.45/starfive-tech/opensbi.git;protocol=ssh;branch=starfive-v1.0-dubhe"
+SRCREV = "066e15f65ca1e71fecf531d0c7c9b49774d414e9"
 
 INSANE_SKIP_${PN}-dev = "ldflags"
 INSANE_SKIP_${PN} = "ldflags"

+ 1 - 1
recipes-images/images/dubhe-image-initramfs.bb

@@ -6,7 +6,7 @@ first 'init' program more efficiently."
 INITRAMFS_SCRIPTS ?= "\
                       initramfs-boot packagegroup-core-boot \
                      "
-PACKAGE_INSTALL = "${INITRAMFS_SCRIPTS} ${VIRTUAL-RUNTIME_base-utils} base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} helloworld coremark dhrystone"
+PACKAGE_INSTALL = "${INITRAMFS_SCRIPTS} ${VIRTUAL-RUNTIME_base-utils} base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} helloworld coremark dhrystone perf"
 
 
 # Do not pollute the initrd image with rootfs features

+ 3 - 3
recipes-images/qspi-image/qspi-image_0.1.bb

@@ -2,7 +2,7 @@ SUMMARY = "QSPI Image Creator"
 DESCRIPTION = "Recipe to create a QSPI Image"
 LICENSE = "CLOSED"
 
-inherit image
+inherit core-image
 
 DEPENDS = "opensbi deploy-bootfiles"
 
@@ -18,6 +18,6 @@ do_image[depends] += " virtual/kernel:do_deploy"
 IMAGE_CMD:qspi () {
 	dd if=${DEPLOY_DIR_IMAGE}/bootcode.bin of=${DEPLOY_DIR_IMAGE}/QSPI-Image.bin bs=1 seek=0 count=4096
 	dd if=${DEPLOY_DIR_IMAGE}/bootjump.bin of=${DEPLOY_DIR_IMAGE}/QSPI-Image.bin bs=1 seek=4096 count=32
-	dd if=${DEPLOY_DIR_IMAGE}/dubhe_fpga.dtb of=${DEPLOY_DIR_IMAGE}/QSPI-Image.bin bs=1 seek=4128 count=4064
-	dd if=${DEPLOY_DIR_IMAGE}/fw_payload.bin of=${DEPLOY_DIR_IMAGE}/QSPI-Image.bin bs=1 seek=8192 count=134209536
+	dd if=${DEPLOY_DIR_IMAGE}/dubhe_fpga.dtb of=${DEPLOY_DIR_IMAGE}/QSPI-Image.bin bs=1 seek=4128 count=8160
+	dd if=${DEPLOY_DIR_IMAGE}/fw_payload.bin of=${DEPLOY_DIR_IMAGE}/QSPI-Image.bin bs=1 seek=12288 
 }

+ 1 - 2
recipes-kernel/linux/files/defconfig

@@ -16,6 +16,7 @@ CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_BLK_DEV_INITRD=y
 #CONFIG_INITRAMFS_SOURCE="rootfs.cpio"
 CONFIG_EXPERT=y
+CONFIG_PERF_EVENTS=y
 CONFIG_SOC_STARFIVE_DUBHE=y
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
@@ -67,7 +68,6 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_DRM=y
 CONFIG_DRM_VIRTIO_GPU=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
 CONFIG_MMC_SPI=y
@@ -115,5 +115,4 @@ CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_FS=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_WQ_WATCHDOG=y
-CONFIG_STACKTRACE=y
 # CONFIG_RCU_TRACE is not set

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

@@ -1,6 +1,6 @@
 FORK = "starfive-tech"
-BRANCH = "starfive-5.15-dev"
-SRCREV = "2f7a93e8fd6d795699d541cbb8a26bba03515d71"
+BRANCH = "starfive-5.15-dubhe"
+SRCREV = "448310505e105564f4ec0ed0802bd700130ac0c6"
 
 LINUX_VERSION = "5.15.0"
 LINUX_VERSION_EXTENSION:append = "-starlight"