Update sm8250: kernel add legacy and edge branch

armbian · Apr 22, 2024 · 3f928f7 · 3f928f7
1 parent 8b9431b
commit 3f928f7
Show file tree

Hide file tree

Showing 20 changed files with 8,958 additions and 140 deletions.
diff --git a/config/boards/ayn-odin2.conf b/config/boards/ayn-odin2.conf
@@ -69,6 +69,9 @@ function post_family_tweaks__ayn-odin2_enable_services() {
 
 	do_with_retries 3 chroot_sdcard_apt_get_install mesa-vulkan-drivers qbootctl qrtr-tools protection-domain-mapper tqftpserv
 
+	# Kernel postinst script to update abl boot partition
+	install -Dm655 $SRC/packages/bsp/ayn-odin2/zz-update-abl-kernel $destination/etc/kernel/postinst.d/
+
 	return 0
 }
 

diff --git a/config/boards/xiaomi-elish.conf b/config/boards/xiaomi-elish.conf
@@ -1,9 +1,9 @@
 # Generate kernel and rootfs image for Qcom ABL booting
 declare -g BOARD_NAME="Xiaomi Elish"
 declare -g BOARD_MAINTAINER="amazingfate"
-declare -g BOARDFAMILY="qcom-abl"
-declare -g KERNEL_TARGET="sm8250"
-declare -g KERNELPATCHDIR="arm64-sm8250"
+declare -g BOARDFAMILY="sm8250"
+declare -g KERNEL_TARGET="current,edge"
+declare -g KERNEL_TEST_TARGET="edge"
 declare -g EXTRAWIFI="no"
 declare -g MODULES="spi-geni-qcom nt36523_ts"
 declare -g BOOTCONFIG="none"
@@ -13,12 +13,6 @@ declare -g -a ABL_DTB_LIST=("sm8250-xiaomi-elish-boe" "sm8250-xiaomi-elish-csot"
 # Use the full firmware, complete linux-firmware plus Armbian's (for qcom/a650_sqe.fw)
 declare -g BOARD_FIRMWARE_INSTALL="-full"
 
-function post_family_config_branch_sm8250__pmos_kernel() {
-	display_alert "Setting up kernel for" "${BOARD}" "info"
-	declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH='tag:v6.7.5'
-}
-
 function xiaomi-elish_is_userspace_supported() {
 	[[ "${RELEASE}" == "jammy" ]] && return 0
 	[[ "${RELEASE}" == "trixie" ]] && return 0

diff --git a/config/boards/xiaomi-umi.wip → config/boards/xiaomi-umi.conf b/config/boards/xiaomi-umi.wip → config/boards/xiaomi-umi.conf
@@ -1,25 +1,19 @@
 # Generate kernel and rootfs image for Qcom ABL booting
 declare -g BOARD_NAME="Xiaomi Umi"
 declare -g BOARD_MAINTAINER="FantasyGmm"
-declare -g BOARDFAMILY="qcom-abl"
-declare -g KERNEL_TARGET="sm8250"
-declare -g KERNELPATCHDIR="arm64-sm8250"
+declare -g BOARDFAMILY="sm8250"
+declare -g KERNEL_TARGET="current,edge"
+declare -g KERNEL_TEST_TARGET="edge"
 declare -g EXTRAWIFI="no"
 declare -g MODULES="spi-geni-qcom"
 declare -g BOOTCONFIG="none"
 declare -g BOOTIMG_CMDLINE_EXTRA="clk_ignore_unused pd_ignore_unused"
 declare -g IMAGE_PARTITION_TABLE="gpt"
-declare -g -a ABL_DTB_LIST=("sm8250-xiaomi-umi")
+declare -g -a ABL_DTB_LIST=("sm8250-xiaomi-umi-csot" "sm8250-xiaomi-umi-sms")
 
 # Use the full firmware, complete linux-firmware plus Armbian's (for qcom/a650_sqe.fw)
 declare -g BOARD_FIRMWARE_INSTALL="-full"
 
-function post_family_config_branch_sm8250__pmos_kernel() {
-	display_alert "Setting up kernel for" "${BOARD}" "info"
-	declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH='branch:linux-6.7.y'
-}
-
 function xiaomi-umi_is_userspace_supported() {
 	[[ "${RELEASE}" == "jammy" ]] && return 0
 	[[ "${RELEASE}" == "trixie" ]] && return 0

diff --git a/config/kernel/linux-arm64-sm8250.config → config/kernel/linux-sm8250-current.config b/config/kernel/linux-arm64-sm8250.config → config/kernel/linux-sm8250-current.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.7.0 Kernel Configuration
+# Linux/arm64 6.7.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
 CONFIG_CC_IS_GCC=y
@@ -373,7 +373,9 @@ CONFIG_ARM64_ERRATUM_2067961=y
 CONFIG_ARM64_ERRATUM_2441009=y
 CONFIG_ARM64_ERRATUM_2457168=y
 CONFIG_ARM64_ERRATUM_2645198=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
+CONFIG_ARM64_ERRATUM_3117295=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -1718,7 +1720,6 @@ CONFIG_PCI_EPF_TEST=m
 #
 # Generic Driver Options
 #
-CONFIG_AUXILIARY_BUS=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
@@ -2715,6 +2716,7 @@ CONFIG_MOUSE_PS2_SMBUS=y
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ST_FTS_V521 is not set
 CONFIG_TOUCHSCREEN_NT36523_SPI=m
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
@@ -3021,7 +3023,7 @@ CONFIG_I2C_GPIO=m
 CONFIG_I2C_QCOM_CCI=m
 CONFIG_I2C_QCOM_GENI=y
 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
@@ -3210,7 +3212,6 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_OF_GPIO_MM_GPIOCHIP=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=y
@@ -3219,7 +3220,7 @@ CONFIG_GPIO_GENERIC=y
 # Memory mapped GPIO drivers
 #
 # CONFIG_GPIO_74XX_MMIO is not set
-CONFIG_GPIO_ALTERA=m
+# CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_DWAPB=y
@@ -3229,12 +3230,12 @@ CONFIG_GPIO_DWAPB=y
 # CONFIG_GPIO_HISI is not set
 # CONFIG_GPIO_HLWD is not set
 # CONFIG_GPIO_LOGICVC is not set
-CONFIG_GPIO_MB86S7X=y
-CONFIG_GPIO_PL061=y
+# CONFIG_GPIO_MB86S7X is not set
+# CONFIG_GPIO_PL061 is not set
 # CONFIG_GPIO_SIFIVE is not set
 # CONFIG_GPIO_SYSCON is not set
 CONFIG_GPIO_WCD934X=m
-CONFIG_GPIO_XGENE=y
+# CONFIG_GPIO_XGENE is not set
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_AMD_FCH is not set
 # end of Memory mapped GPIO drivers
@@ -3247,10 +3248,8 @@ CONFIG_GPIO_XGENE=y
 # CONFIG_GPIO_DS4520 is not set
 # CONFIG_GPIO_GW_PLD is not set
 # CONFIG_GPIO_MAX7300 is not set
-CONFIG_GPIO_MAX732X=y
-# CONFIG_GPIO_MAX732X_IRQ is not set
-CONFIG_GPIO_PCA953X=y
-CONFIG_GPIO_PCA953X_IRQ=y
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCA9570 is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_TPIC2810 is not set
@@ -3708,7 +3707,6 @@ CONFIG_MFD_SEC_CORE=y
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_TI_LMU is not set
@@ -3859,7 +3857,6 @@ CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REGULATOR_VQMMC_IPQ4019 is not set
 # CONFIG_REGULATOR_QCOM_LABIBB is not set
 # CONFIG_RC_CORE is not set
-CONFIG_CEC_CORE=m
 
 #
 # CEC support
@@ -4125,6 +4122,7 @@ CONFIG_DRM_PANEL=y
 #
 # Display Panels
 #
+# CONFIG_DRM_PANEL_XIAOMI_UMI_CSOT is not set
 # CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
@@ -4249,14 +4247,12 @@ CONFIG_DRM_THINE_THC63LVD1024=m
 # CONFIG_DRM_TI_DLPC3433 is not set
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI83 is not set
-CONFIG_DRM_TI_SN65DSI86=m
+# CONFIG_DRM_TI_SN65DSI86 is not set
 # CONFIG_DRM_TI_TPD12S015 is not set
 # CONFIG_DRM_ANALOGIX_ANX6345 is not set
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 # CONFIG_DRM_ANALOGIX_ANX7625 is not set
-CONFIG_DRM_I2C_ADV7511=m
-CONFIG_DRM_I2C_ADV7511_AUDIO=y
-CONFIG_DRM_I2C_ADV7511_CEC=y
+# CONFIG_DRM_I2C_ADV7511 is not set
 # CONFIG_DRM_CDNS_DSI is not set
 # CONFIG_DRM_CDNS_MHDP8546 is not set
 # end of Display Interface Bridges