From 78f9b0c63e0598e035bab7aa1e920e64198ff0e2 Mon Sep 17 00:00:00 2001 From: Yassine Oudjana Date: Sun, 24 Oct 2021 16:16:07 +0400 Subject: [PATCH] main/linux-postmarketos-qcom-msm8996: upgrade to 5.15.0 (MR 2650) Upgrade to 5.15.0, disable some unused I2C and SPI configs, and remove msm8996 from linux-msm8996-$_tag, since $_tag already includes msm8996 and makes the first one redundant. [ci:skip-build] Already built on CI in MR --- main/linux-postmarketos-qcom-msm8996/APKBUILD | 12 +-- .../config-postmarketos-qcom-msm8996.aarch64 | 85 +++++++++---------- 2 files changed, 48 insertions(+), 49 deletions(-) diff --git a/main/linux-postmarketos-qcom-msm8996/APKBUILD b/main/linux-postmarketos-qcom-msm8996/APKBUILD index 3637c242d..7a84e3ca0 100644 --- a/main/linux-postmarketos-qcom-msm8996/APKBUILD +++ b/main/linux-postmarketos-qcom-msm8996/APKBUILD @@ -3,12 +3,12 @@ _flavor="postmarketos-qcom-msm8996" pkgname=linux-$_flavor -pkgver=5.15.0_rc4 +pkgver=5.15.0 pkgrel=1 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices" arch="aarch64" _carch="arm64" -url="https://gitlab.com/msm8996-mainline/linux-msm8996" +url="https://gitlab.com/msm8996-mainline/linux" license="GPL-2.0-only" options="!strip !check !tracedeps pmb:cross-native pmb:kconfigcheck-nftables pmb:kconfigcheck-anbox" makedepends="bison findutils flex installkernel openssl-dev perl" @@ -16,10 +16,10 @@ makedepends="bison findutils flex installkernel openssl-dev perl" # Source _tag=v${pkgver//_/-}-msm8996 source=" - linux-msm8996-$_tag.tar.gz::$url/-/archive/$_tag/linux-msm8996-$_tag.tar.gz + linux-$_tag.tar.gz::$url/-/archive/$_tag/linux-$_tag.tar.gz config-$_flavor.$arch " -builddir="$srcdir/linux-msm8996-$_tag" +builddir="$srcdir/linux-$_tag" prepare() { default_prepare @@ -47,6 +47,6 @@ package() { INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb } sha512sums=" -56db898febb7b49fd12012f92d4a2b35ec36325777ebc83772a03f116ff11ffd10b546074397b8d097baecc53793736c327f6cf62ce13906cc5f2cd197308df0 linux-msm8996-v5.15.0-rc4-msm8996.tar.gz -e989d98b886d70becf97479faeae57cdb7389d0812b2edeb79a4823ee03058cf73919a317c2122f93027bbcf2c329abec0aad488ce64995cba7970ceabb6a010 config-postmarketos-qcom-msm8996.aarch64 +13a9903e7d0d8ed27ad210457e671fab0f9cb70b0952c3b857e65bbaf5883a77114b41eae4ca2a105ecdceae1c978ae86e1d42db4c203ebdda64403ccbc856e2 linux-v5.15.0-msm8996.tar.gz +31ed5ec7806e53a0cc950ce0a07c71008e60274427ca7f2686caa3782ace468ced6fb3ed1dc96bae9146392f3b2539d8cf401bce884e822dc3b84a49c7e3e28e config-postmarketos-qcom-msm8996.aarch64 " diff --git a/main/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64 b/main/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64 index dfbea8fd6..8b0d6c62a 100644 --- a/main/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64 +++ b/main/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64 @@ -1,8 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.0-rc4 Kernel Configuration +# Linux/arm64 5.15.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.3.1_git20210921) 10.3.1 20210921" +CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=100301 CONFIG_CLANG_VERSION=0 @@ -574,37 +574,6 @@ CONFIG_ARM_QCOM_CPUFREQ_HW=y # end of CPU Frequency scaling # end of CPU Power Management -# -# Firmware Drivers -# - -# -# ARM System Control and Management Interface Protocol -# -# CONFIG_ARM_SCMI_PROTOCOL is not set -# end of ARM System Control and Management Interface Protocol - -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_ARM_SCPI_POWER_DOMAIN=y -# CONFIG_ARM_SDE_INTERFACE is not set -# CONFIG_FIRMWARE_MEMMAP is not set -# CONFIG_FW_CFG_SYSFS is not set -CONFIG_QCOM_SCM=y -# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set -# CONFIG_ARM_FFA_TRANSPORT is not set -# CONFIG_GOOGLE_FIRMWARE is not set -CONFIG_ARM_PSCI_FW=y -# CONFIG_ARM_PSCI_CHECKER is not set -CONFIG_HAVE_ARM_SMCCC=y -CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y -CONFIG_ARM_SMCCC_SOC_ID=y - -# -# Tegra firmware driver -# -# end of Tegra firmware driver -# end of Firmware Drivers - CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_VIRTUALIZATION=y # CONFIG_KVM is not set @@ -1603,12 +1572,43 @@ CONFIG_GENERIC_ARCH_NUMA=y CONFIG_BRCMSTB_GISB_ARB=y # CONFIG_MOXTET is not set CONFIG_QCOM_EBI2=y -CONFIG_SIMPLE_PM_BUS=y CONFIG_VEXPRESS_CONFIG=y # CONFIG_MHI_BUS is not set # end of Bus devices # CONFIG_CONNECTOR is not set + +# +# Firmware Drivers +# + +# +# ARM System Control and Management Interface Protocol +# +# CONFIG_ARM_SCMI_PROTOCOL is not set +# end of ARM System Control and Management Interface Protocol + +CONFIG_ARM_SCPI_PROTOCOL=y +CONFIG_ARM_SCPI_POWER_DOMAIN=y +# CONFIG_ARM_SDE_INTERFACE is not set +# CONFIG_FIRMWARE_MEMMAP is not set +# CONFIG_FW_CFG_SYSFS is not set +CONFIG_QCOM_SCM=y +# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set +# CONFIG_ARM_FFA_TRANSPORT is not set +# CONFIG_GOOGLE_FIRMWARE is not set +CONFIG_ARM_PSCI_FW=y +# CONFIG_ARM_PSCI_CHECKER is not set +CONFIG_HAVE_ARM_SMCCC=y +CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y +CONFIG_ARM_SMCCC_SOC_ID=y + +# +# Tegra firmware driver +# +# end of Tegra firmware driver +# end of Firmware Drivers + # CONFIG_GNSS is not set CONFIG_MTD=y # CONFIG_MTD_TESTS is not set @@ -2596,9 +2596,7 @@ CONFIG_I2C_ALGOBIT=m # # CONFIG_I2C_CADENCE is not set # CONFIG_I2C_CBUS_GPIO is not set -CONFIG_I2C_DESIGNWARE_CORE=y -# CONFIG_I2C_DESIGNWARE_SLAVE is not set -CONFIG_I2C_DESIGNWARE_PLATFORM=y +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set # CONFIG_I2C_DESIGNWARE_PCI is not set # CONFIG_I2C_EMEV2 is not set # CONFIG_I2C_GPIO is not set @@ -2607,7 +2605,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y # CONFIG_I2C_PCA_PLATFORM is not set CONFIG_I2C_QCOM_CCI=m CONFIG_I2C_QUP=y -CONFIG_I2C_RK3X=y +# CONFIG_I2C_RK3X is not set # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_THUNDERX is not set # CONFIG_I2C_XILINX is not set @@ -2649,15 +2647,15 @@ CONFIG_SPI_MEM=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_CADENCE is not set -CONFIG_SPI_CADENCE_QUADSPI=y +# CONFIG_SPI_CADENCE_QUADSPI is not set # CONFIG_SPI_DESIGNWARE is not set -CONFIG_SPI_NXP_FLEXSPI=y +# CONFIG_SPI_NXP_FLEXSPI is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_OC_TINY is not set -CONFIG_SPI_PL022=y +# CONFIG_SPI_PL022 is not set # CONFIG_SPI_PXA2XX is not set -CONFIG_SPI_ROCKCHIP=y +# CONFIG_SPI_ROCKCHIP is not set # CONFIG_SPI_QCOM_QSPI is not set CONFIG_SPI_QUP=y # CONFIG_SPI_SC18IS602 is not set @@ -5240,6 +5238,7 @@ CONFIG_IOMMU_DMA=y CONFIG_ARM_SMMU=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y +CONFIG_ARM_SMMU_QCOM=y CONFIG_ARM_SMMU_V3=y # CONFIG_ARM_SMMU_V3_SVA is not set CONFIG_QCOM_IOMMU=y @@ -6007,7 +6006,7 @@ CONFIG_INTERCONNECT_QCOM_MSM8996=y # CONFIG_INTERCONNECT_QCOM_OSM_L3 is not set # CONFIG_INTERCONNECT_QCOM_QCS404 is not set # CONFIG_INTERCONNECT_QCOM_SDM660 is not set -CONFIG_INTERCONNECT_QCOM_SMD_RPM_QOS=y +CONFIG_INTERCONNECT_QCOM_SMD_RPM=y # CONFIG_COUNTER is not set # CONFIG_MOST is not set # end of Device Drivers