From 76f8aa61d66880a689f329af5cae5279d8e0feef Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 26 Nov 2021 09:22:45 +1030 Subject: linux-aspeed: Fixes for SCU IRQ, MDIO, clock, vga_pw Billy Tsai (1): irqchip/aspeed-scu: Replace update_bits with write_bits. Dylan Hung (1): mdio: aspeed: Fix "Link is Down" issue Joel Stanley (2): drm/aspeed: Fix vga_pw sysfs output clk/ast2600: Fix soc revision for AHB Change-Id: Idd8d89c4869faa8528f1c5066ec3ed467ea85911 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed/recipes-kernel/linux') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index a11f9ace0..e51e593d9 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.15" LINUX_VERSION ?= "5.15" -SRCREV="781a66e81bbb9081e74d9ba0fcee095fefa1048e" +SRCREV="58704e2943803ded612b42510874b63b518aa214" require linux-aspeed.inc -- cgit v1.2.3 From 56a2722a9a9c2da717e4a5ea565dec563bb4ace1 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 26 Nov 2021 09:48:50 +1030 Subject: linux-aspeed: Move to v5.15.5 stable release This includes security and bug fixes from the 5.15.1 through to 5.15.5 stable releases. Signed-off-by: Joel Stanley Change-Id: Ibe8c433439b5863b0d49934d4d43b239bdc736d7 --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed/recipes-kernel/linux') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index e51e593d9..3208f9c9b 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.15" -LINUX_VERSION ?= "5.15" +LINUX_VERSION ?= "5.15.5" -SRCREV="58704e2943803ded612b42510874b63b518aa214" +SRCREV="ebd46c8290139e545fbb16201b2b26851a657baa" require linux-aspeed.inc -- cgit v1.2.3 From d1bd828bbfcaa7629f64dbf97a5b504e3e6a2b1f Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 2 Dec 2021 11:51:59 +1030 Subject: linux-aspeed: Refresh defconfigs The defconfigs are regenerated using savedefconfig. No options are changed. An explanation as to why some are removed from the defconfig: - ZBOOT_ROM_TEXT and ZBOOT_ROM_BSS default to 0x0 (and we odn't use them) - SECOMMP is now on by default - BLK_DEV_BSG is now behind SCSI, which we do not enable - I2C_MUX is selected by the MEDIA subsystem - MCTP_LPC is gone - NET_VENDOR_AURORA is gone - PECI is not in the tree :( - ASPEED_LPC drivers are enabled by default The other options move their order but are still present. Change-Id: Ib03b6dab4804e354629b9bf7f4e0951b6131462c Signed-off-by: Joel Stanley --- .../linux/linux-aspeed/aspeed-g4/defconfig | 12 +++--------- .../linux/linux-aspeed/aspeed-g5/defconfig | 13 +++---------- .../linux/linux-aspeed/aspeed-g6/defconfig | 22 ++++------------------ 3 files changed, 10 insertions(+), 37 deletions(-) (limited to 'meta-aspeed/recipes-kernel/linux') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig index 08ac6eb04..a9920dde4 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig @@ -3,6 +3,7 @@ CONFIG_KERNEL_XZ=y CONFIG_SYSVIPC=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 @@ -17,7 +18,6 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_UID16 is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_AIO is not set -CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set @@ -29,15 +29,10 @@ CONFIG_MACH_ASPEED_G4=y CONFIG_VMSPLIT_2G=y CONFIG_AEABI=y CONFIG_UACCESS_WITH_MEMCPY=y -CONFIG_SECCOMP=y # CONFIG_ATAGS is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_KEXEC=y -CONFIG_FIRMWARE_MEMMAP=y CONFIG_JUMP_LABEL=y CONFIG_STRICT_KERNEL_RWX=y -# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEBUG_FS is not set # CONFIG_MQ_IOSCHED_DEADLINE is not set # CONFIG_MQ_IOSCHED_KYBER is not set @@ -69,6 +64,7 @@ CONFIG_NET_NCSI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FIRMWARE_MEMMAP=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y CONFIG_MTD_PARTITIONED_MASTER=y @@ -186,8 +182,6 @@ CONFIG_RTC_DRV_PCF8523=y CONFIG_RTC_DRV_RV8803=y # CONFIG_VIRTIO_MENU is not set # CONFIG_IOMMU_SUPPORT is not set -CONFIG_ASPEED_LPC_CTRL=y -CONFIG_ASPEED_LPC_SNOOP=y CONFIG_IIO=y CONFIG_ASPEED_ADC=y CONFIG_MAX1363=y @@ -226,6 +220,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_GDB_SCRIPTS=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_FS=y +CONFIG_DEBUG_WX=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 @@ -235,6 +230,5 @@ CONFIG_WQ_WATCHDOG=y # CONFIG_SCHED_DEBUG is not set CONFIG_DEBUG_LIST=y CONFIG_FUNCTION_TRACER=y -CONFIG_DEBUG_WX=y CONFIG_DEBUG_USER=y # CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig index e194892f3..35eabcfe2 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -3,6 +3,7 @@ CONFIG_KERNEL_XZ=y CONFIG_SYSVIPC=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y CONFIG_PSI=y CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_IKCONFIG=y @@ -19,7 +20,6 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_UID16 is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_AIO is not set -CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set @@ -32,16 +32,11 @@ CONFIG_MACH_ASPEED_G5=y # CONFIG_CACHE_L2X0 is not set CONFIG_VMSPLIT_2G=y CONFIG_UACCESS_WITH_MEMCPY=y -CONFIG_SECCOMP=y # CONFIG_ATAGS is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_KEXEC=y # CONFIG_SUSPEND is not set -CONFIG_FIRMWARE_MEMMAP=y CONFIG_JUMP_LABEL=y CONFIG_STRICT_KERNEL_RWX=y -# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEBUG_FS is not set # CONFIG_MQ_IOSCHED_DEADLINE is not set # CONFIG_MQ_IOSCHED_KYBER is not set @@ -73,6 +68,7 @@ CONFIG_NET_NCSI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FIRMWARE_MEMMAP=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y CONFIG_MTD_PARTITIONED_MASTER=y @@ -148,7 +144,6 @@ CONFIG_HW_RANDOM_TIMERIOMEM=y CONFIG_DEVMEM_BOOTPARAM=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA9541=y CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_ASPEED=y @@ -210,8 +205,6 @@ CONFIG_RTC_DRV_PCF8523=y CONFIG_RTC_DRV_RV8803=y # CONFIG_VIRTIO_MENU is not set # CONFIG_IOMMU_SUPPORT is not set -CONFIG_ASPEED_LPC_CTRL=y -CONFIG_ASPEED_LPC_SNOOP=y CONFIG_ASPEED_XDMA=y CONFIG_IIO=y CONFIG_ASPEED_ADC=y @@ -255,6 +248,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_GDB_SCRIPTS=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_FS=y +CONFIG_DEBUG_WX=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 @@ -264,6 +258,5 @@ CONFIG_WQ_WATCHDOG=y # CONFIG_SCHED_DEBUG is not set CONFIG_DEBUG_LIST=y CONFIG_FUNCTION_TRACER=y -CONFIG_DEBUG_WX=y CONFIG_DEBUG_USER=y # CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index fa3507d5d..451afd81a 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -3,6 +3,7 @@ CONFIG_KERNEL_XZ=y CONFIG_SYSVIPC=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y CONFIG_PSI=y CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_IKCONFIG=y @@ -19,7 +20,6 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_UID16 is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_AIO is not set -CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set @@ -34,17 +34,12 @@ CONFIG_VMSPLIT_2G=y CONFIG_NR_CPUS=2 CONFIG_HIGHMEM=y CONFIG_UACCESS_WITH_MEMCPY=y -CONFIG_SECCOMP=y # CONFIG_ATAGS is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_KEXEC=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y -CONFIG_FIRMWARE_MEMMAP=y CONFIG_JUMP_LABEL=y -# CONFIG_BLK_DEV_BSG is not set # CONFIG_MQ_IOSCHED_DEADLINE is not set # CONFIG_MQ_IOSCHED_KYBER is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set @@ -75,6 +70,7 @@ CONFIG_NET_NCSI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FIRMWARE_MEMMAP=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y CONFIG_MTD_PARTITIONED_MASTER=y @@ -86,7 +82,6 @@ CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_BLOCK=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y -CONFIG_MCTP_LPC=y CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=y CONFIG_MD=y @@ -98,7 +93,6 @@ CONFIG_NETCONSOLE=y # CONFIG_NET_VENDOR_AMAZON is not set # CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_VENDOR_AURORA is not set # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_CADENCE is not set # CONFIG_NET_VENDOR_CAVIUM is not set @@ -155,14 +149,13 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_ASPEED_KCS_IPMI_BMC=y CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y -CONFIG_IPMI_KCS_BMC_CDEV_RAW=y CONFIG_IPMI_KCS_BMC_SERIO=y +CONFIG_IPMI_KCS_BMC_CDEV_RAW=y CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y CONFIG_DEVMEM_BOOTPARAM=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MUX=y CONFIG_I2C_MUX_GPIO=y CONFIG_I2C_MUX_PCA9541=y CONFIG_I2C_MUX_PCA954x=y @@ -185,8 +178,6 @@ CONFIG_SENSORS_LM75=y CONFIG_SENSORS_NCT7904=y CONFIG_SENSORS_OCC_P8_I2C=y CONFIG_SENSORS_OCC_P9_SBE=y -CONFIG_SENSORS_PECI_CPUTEMP=y -CONFIG_SENSORS_PECI_DIMMTEMP=y CONFIG_PMBUS=y CONFIG_SENSORS_ADM1275=y CONFIG_SENSORS_IBM_CFFPS=y @@ -241,9 +232,6 @@ CONFIG_RTC_DRV_RV8803=y CONFIG_RTC_DRV_ASPEED=y # CONFIG_VIRTIO_MENU is not set # CONFIG_IOMMU_SUPPORT is not set -CONFIG_ASPEED_LPC_CTRL=y -CONFIG_ASPEED_LPC_SNOOP=y -CONFIG_ASPEED_P2A_CTRL=y CONFIG_ASPEED_XDMA=y CONFIG_IIO=y CONFIG_ASPEED_ADC=y @@ -257,8 +245,6 @@ CONFIG_FSI_MASTER_ASPEED=y CONFIG_FSI_SCOM=y CONFIG_FSI_SBEFIFO=y CONFIG_FSI_OCC=y -CONFIG_PECI=y -CONFIG_PECI_ASPEED=y CONFIG_EXT4_FS=y CONFIG_FANOTIFY=y CONFIG_OVERLAY_FS=y @@ -290,6 +276,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_GDB_SCRIPTS=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_FS=y +CONFIG_DEBUG_WX=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 @@ -300,6 +287,5 @@ CONFIG_WQ_WATCHDOG=y # CONFIG_SCHED_DEBUG is not set CONFIG_DEBUG_LIST=y CONFIG_FUNCTION_TRACER=y -CONFIG_DEBUG_WX=y CONFIG_DEBUG_USER=y # CONFIG_RUNTIME_TESTING_MENU is not set -- cgit v1.2.3 From 5b85fa5a554cdbcbd731abd06d466166e63362ea Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 22 Dec 2021 11:33:50 +1030 Subject: linux-aspeed: Add s7106, Bletchley, Vegman These are backports from the v5.17 aspeed pull request. Ali El-Haj-Mahmoud (1): ARM: dts: aspeed: Add TYAN S8036 BMC machine Andrei Kartashev (2): dt-bindings: vendor-prefixes: add YADRO ARM: dts: aspeed: add device tree for YADRO VEGMAN BMC Eddie James (2): ARM: dts: aspeed: p10: Enable USB host ports ARM: dts: aspeed: p10: Add TPM device Howard Chiu (1): ARM: dts: aspeed: Adding Facebook Bletchley BMC Jae Hyun Yoo (3): ARM: dts: aspeed: add LCLK setting into LPC IBT node ARM: dts: aspeed: add LCLK setting into LPC KCS nodes dt-bindings: ipmi: bt-bmc: add 'clocks' as a required property Joel Stanley (3): dt-bindings: aspeed: Add Secure Boot Controller bindings ARM: dts: aspeed: Add secure boot controller node ipmi: bt: Add ast2600 compatible string Lei YU (2): ARM: dts: Add openbmc-flash-layout-64-alt.dtsi ARM: dts: aspeed: g220a: Enable secondary flash Oskar Senft (1): ARM: dts: aspeed: tyan-s7106: Add uart_routing and fix vuart config Quan Nguyen (2): ARM: dts: aspeed: mtjade: Add I2C buses for NVMe devices ARM: dts: aspeed: mtjade: Add uefi partition Change-Id: I89371d3ab9c99415b3e971fbb62a6cad8b8e4b16 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed/recipes-kernel/linux') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 3208f9c9b..f06557204 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.15" LINUX_VERSION ?= "5.15.5" -SRCREV="ebd46c8290139e545fbb16201b2b26851a657baa" +SRCREV="c1649f9ee389fc155959bd87f4a1f5ac969187c7" require linux-aspeed.inc -- cgit v1.2.3 From f4b7cd1673cf336ed5bdf45afeb9da68692c08f3 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 22 Dec 2021 12:18:26 +1030 Subject: linux-aspeed: Move to v5.15.10 stable release This includes security and bug fixes from the 5.15.6 through to 5.15.10 stable releases. Change-Id: Ib4e8e69386ba6c7857c22d8b2fb063c9d8d03b36 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed/recipes-kernel/linux') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index f06557204..f90c6278c 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.15" -LINUX_VERSION ?= "5.15.5" +LINUX_VERSION ?= "5.15.10" -SRCREV="c1649f9ee389fc155959bd87f4a1f5ac969187c7" +SRCREV="dd1e40cecc7ca43ce22552e380bbc00b720575f5" require linux-aspeed.inc -- cgit v1.2.3 From 8c3075a3a50ec16c8c9fb93a1785a5abb13386c5 Mon Sep 17 00:00:00 2001 From: Potin Lai Date: Mon, 13 Dec 2021 23:13:02 +0800 Subject: meta-aspeed: Enable tpm2 kernel config Append tpm2 in MACHINE_FEATURES to enable related kernel configs MACHINE_FEATURES:append = " tpm2" Signed-off-by: Potin Lai Change-Id: Ie6b50d81040de2863487cffc449193ec9462bf89 --- meta-aspeed/recipes-kernel/linux/linux-aspeed.inc | 1 + meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.cfg | 6 ++++++ meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.scc | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.cfg create mode 100644 meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.scc (limited to 'meta-aspeed/recipes-kernel/linux') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc index aa060295f..6098885d5 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc @@ -12,6 +12,7 @@ SRC_URI += " \ file://defconfig \ file://rsa_oem_fitimage_key.key;sha256sum=eeb4ff2ebbfbd97b6254fe6dbaeea41067e54c65176c233ec7b2ab2decf1ddcd \ file://rsa_oem_fitimage_key.crt;sha256sum=45f5a55497cce8040999bf9f3214d471ac7b83ab7acef41c4425a34662e8372e \ + ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'file://tpm/tpm2.scc', '', d)} \ " LINUX_VERSION_EXTENSION ?= "-${SRCREV}" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.cfg b/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.cfg new file mode 100644 index 000000000..9479a7b41 --- /dev/null +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.cfg @@ -0,0 +1,6 @@ +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y +CONFIG_TCG_TIS_SPI=y +CONFIG_SECURITYFS=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.scc b/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.scc new file mode 100644 index 000000000..088148fec --- /dev/null +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.scc @@ -0,0 +1,3 @@ +define KFEATURE_DESCRIPTION "Enable TPM 2.0" + +kconf hardware tpm2.cfg -- cgit v1.2.3