Remove RK3588 midstream kernel as there is no point of having it

+ move RK3588 EDGE tag to 6.6.y branch

config/boards/rock-5b.conf

@@ -3,7 +3,7 @@ BOARD_NAME="Rock 5B"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate linhz0hz"
 BOOTCONFIG="rock-5b-rk3588_defconfig"
-KERNEL_TARGET="legacy,edge,midstream,collabora"
+KERNEL_TARGET="legacy,edge,collabora"
 KERNEL_TEST_TARGET="legacy,collabora" # in case different then kernel target
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/kernel/linux-rockchip-rk3588-edge.config

@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.0-rc1 Kernel Configuration
+# Linux/arm64 6.6.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110300
+CONFIG_GCC_VERSION=110400
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=23800
@@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=122
+CONFIG_PAHOLE_VERSION=125
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -393,6 +393,7 @@ CONFIG_ARM64_ERRATUM_2067961=y
 CONFIG_ARM64_ERRATUM_2441009=y
 CONFIG_ARM64_ERRATUM_2457168=y
 CONFIG_ARM64_ERRATUM_2645198=y
+CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -4420,7 +4421,6 @@ CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # end of Multiplexer I2C Chip support
 
-# CONFIG_I2C_ATR is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -5708,6 +5708,7 @@ CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=m
+# CONFIG_IPU_BRIDGE is not set
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_SAA7706H=m
@@ -9310,8 +9311,6 @@ CONFIG_PHY_MAPPHONE_MDM6600=m
 # CONFIG_PHY_OCELOT_SERDES is not set
 CONFIG_PHY_QCOM_USB_HS=y
 CONFIG_PHY_QCOM_USB_HSIC=y
-# CONFIG_PHY_RTK_RTD_USB2PHY is not set
-# CONFIG_PHY_RTK_RTD_USB3PHY is not set
 CONFIG_PHY_ROCKCHIP_DP=y
 CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
 CONFIG_PHY_ROCKCHIP_EMMC=y
@@ -9919,6 +9918,8 @@ CONFIG_IMA_APPRAISE=y
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 # CONFIG_IMA_APPRAISE_MODSIG is not set
 # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
+# CONFIG_IMA_BLACKLIST_KEYRING is not set
+# CONFIG_IMA_LOAD_X509 is not set
 CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
 CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
 # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set

config/sources/families/rockchip-rk3588.conf

@@ -35,22 +35,10 @@ case $BRANCH in
 		LINUXFAMILY=rockchip-rk3588
 		LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH
 		KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
-		KERNELBRANCH='tag:v6.6-rc1'
+		KERNELBRANCH='branch:linux-6.6.y'
 		KERNELPATCHDIR='rockchip-rk3588-edge'
 		;;
 
-	midstream)
-		# A half monster kernel, a cross between sre mainline and downstream rk kernel
-		SKIP_BOOTSPLASH="yes"
-		LINUXFAMILY=rockchip-rk3588
-		LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH
-		KERNEL_MAJOR_MINOR="6.2"                   # Major and minor versions of this kernel.
-		KERNELPATCHDIR='rockchip-rk3588-midstream' # Empty/nonexisting, so zero patches, hopefully
-		KERNELSOURCE='https://github.com/Googulator/linux-rk3588-midstream.git'
-		KERNELBRANCH='branch:midstream'
-		KERNEL_DRIVERS_SKIP+=(driver_rtw88) # This is a 6.2-rcX kernel, while the rtw88 driver patching expects 6.2.0+
-		;;
-
 	collabora)
 		# Collabora's rk3588, where the action is these days
 		SKIP_BOOTSPLASH="yes"