diff options
3 files changed, 6 insertions, 5 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig index 49e9370dd..71e6d27db 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig @@ -149,9 +149,9 @@ CONFIG_SENSORS_OCC_P8_I2C=y CONFIG_PMBUS=y # CONFIG_SENSORS_PMBUS is not set CONFIG_SENSORS_ADM1275=y +CONFIG_SENSORS_IBM_CFFPS=y CONFIG_SENSORS_LM25066=y CONFIG_SENSORS_MAX31785=y -CONFIG_SENSORS_IBM_CFFPS=y CONFIG_SENSORS_UCD9000=y CONFIG_SENSORS_TMP421=y # CONFIG_HID is not set @@ -200,6 +200,7 @@ CONFIG_LOCKUP_DETECTOR=y CONFIG_WQ_WATCHDOG=y CONFIG_PANIC_TIMEOUT=-1 # CONFIG_SCHED_DEBUG is not set +CONFIG_TIMER_STATS=y CONFIG_FUNCTION_TRACER=y # CONFIG_TRACING_EVENTS_GPIO is not set # CONFIG_CRYPTO_ECHAINIV is not set diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig index 10dc73146..87dd3ad2f 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig @@ -11,10 +11,10 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set -CONFIG_KALLSYMS_ALL=y CONFIG_BPF_SYSCALL=y # CONFIG_AIO is not set CONFIG_EMBEDDED=y +CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y CONFIG_JUMP_LABEL=y @@ -148,10 +148,10 @@ CONFIG_SENSORS_OCC=y CONFIG_SENSORS_OCC_P9_SBE=y CONFIG_PMBUS=y CONFIG_SENSORS_ADM1275=y +CONFIG_SENSORS_IBM_CFFPS=y CONFIG_SENSORS_IR35221=y CONFIG_SENSORS_LM25066=y CONFIG_SENSORS_MAX31785=y -CONFIG_SENSORS_IBM_CFFPS=y CONFIG_SENSORS_UCD9000=y CONFIG_SENSORS_UCD9200=y CONFIG_SENSORS_TMP421=y @@ -207,8 +207,8 @@ CONFIG_STRIP_ASM_SYMS=y CONFIG_LOCKUP_DETECTOR=y CONFIG_WQ_WATCHDOG=y CONFIG_PANIC_TIMEOUT=-1 -# CONFIG_SCHED_DEBUG is not set CONFIG_SCHED_STACK_END_CHECK=y +CONFIG_TIMER_STATS=y CONFIG_FUNCTION_TRACER=y # CONFIG_TRACING_EVENTS_GPIO is not set CONFIG_DEBUG_USER=y diff --git a/meta-phosphor/classes/obmc-phosphor-debug-tarball.bbclass b/meta-phosphor/classes/obmc-phosphor-debug-tarball.bbclass index a7d2dc49b..528267855 100644 --- a/meta-phosphor/classes/obmc-phosphor-debug-tarball.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-debug-tarball.bbclass @@ -6,7 +6,7 @@ IMAGE_FSTYPES = "tar.xz" inherit image inherit obmc-phosphor-license -IMAGE_INSTALL_append = " busybox packagegroup-obmc-phosphor-debugtools" +IMAGE_INSTALL_append = " busybox packagegroup-obmc-phosphor-debugtools perf " # Override from image_types.bbclass to restrict tarball to /usr tree. IMAGE_CMD_tar = "${IMAGE_CMD_TAR} -cvf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS}/usr ." |