diff --git a/config/kernel/linux-media-edge.config b/config/kernel/linux-media-edge.config
index 52256ba2ee..c5006aff4a 100644
--- a/config/kernel/linux-media-edge.config
+++ b/config/kernel/linux-media-edge.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.16.2 Kernel Configuration
+# Linux/arm64 5.16.8 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -597,6 +597,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=y
 CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
 CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
 CONFIG_ARM_SCPI_CPUFREQ=y
+CONFIG_ARM_SCMI_CPUFREQ=m
 CONFIG_ARM_TEGRA20_CPUFREQ=m
 CONFIG_ARM_TEGRA124_CPUFREQ=y
 CONFIG_ARM_TEGRA186_CPUFREQ=m
@@ -2222,7 +2223,14 @@ CONFIG_CONNECTOR=m
 #
 # ARM System Control and Management Interface Protocol
 #
-# CONFIG_ARM_SCMI_PROTOCOL is not set
+CONFIG_ARM_SCMI_PROTOCOL=m
+CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
+CONFIG_ARM_SCMI_HAVE_SHMEM=y
+CONFIG_ARM_SCMI_HAVE_MSG=y
+CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
+CONFIG_ARM_SCMI_TRANSPORT_SMC=y
+CONFIG_ARM_SCMI_TRANSPORT_VIRTIO=y
+CONFIG_ARM_SCMI_POWER_DOMAIN=m
 # end of ARM System Control and Management Interface Protocol
 
 CONFIG_ARM_SCPI_PROTOCOL=y
@@ -4717,6 +4725,7 @@ CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
 CONFIG_SENSORS_AS370=m
 CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_ARM_SCMI=m
 CONFIG_SENSORS_ARM_SCPI=m
 CONFIG_SENSORS_ASPEED=m
 CONFIG_SENSORS_ATXP1=m
@@ -5151,6 +5160,7 @@ CONFIG_REGULATOR_88PG86X=m
 CONFIG_REGULATOR_AAT2870=m
 CONFIG_REGULATOR_ARIZONA_LDO1=m
 CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_ARM_SCMI=m
 CONFIG_REGULATOR_AS3711=m
 CONFIG_REGULATOR_AS3722=m
 CONFIG_REGULATOR_ATC260X=m
@@ -6423,9 +6433,11 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+CONFIG_BOOTSPLASH=y
 # end of Console display driver support
 
 CONFIG_LOGO=y
@@ -8261,6 +8273,7 @@ CONFIG_LMK04832=m
 # CONFIG_COMMON_CLK_MAX77686 is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_RK808=y
+CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=y
 CONFIG_COMMON_CLK_SI5341=m
 # CONFIG_COMMON_CLK_SI5351 is not set
@@ -8701,6 +8714,7 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 #
 # IIO SCMI Sensors
 #
+CONFIG_IIO_SCMI=m
 # end of IIO SCMI Sensors
 
 #
@@ -9101,6 +9115,7 @@ CONFIG_PARTITION_PERCPU=y
 # CONFIG_IPACK_BUS is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_SCMI=m
 CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_SUNXI=y
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/config/sources/families/jetson-nano.conf b/config/sources/families/jetson-nano.conf
index 2860126886..a5109b6f8c 100644
--- a/config/sources/families/jetson-nano.conf
+++ b/config/sources/families/jetson-nano.conf
@@ -29,7 +29,7 @@ case $BRANCH in
 	;;
 
 	edge)
-		SKIP_BOOTSPLASH="yes"
+#		SKIP_BOOTSPLASH="yes"
 		KERNELBRANCH="branch:linux-5.16.y"
 		KERNELPATCHDIR='media-'$BRANCH
 		LINUXFAMILY=media
@@ -39,11 +39,6 @@ case $BRANCH in
 
 esac
 
-write_uboot_platform()
-{
-	dd if=$1/u-boot.bin of=$2 bs=32k seek=1 status=noxfer > /dev/null 2>&1
-}
-
 family_tweaks()
 {
 
diff --git a/config/sources/families/media.conf b/config/sources/families/media.conf
index 66031a017e..1652d20c80 100644
--- a/config/sources/families/media.conf
+++ b/config/sources/families/media.conf
@@ -36,7 +36,7 @@ case $BRANCH in
 	;;
 
 	edge)
-			SKIP_BOOTSPLASH="yes"
+#			SKIP_BOOTSPLASH="yes"
 			KERNELBRANCH="branch:linux-5.16.y"
 			KERNELPATCHDIR='media-'$BRANCH
 			LINUXFAMILY=media