diff --git a/config/sources/families/spacemit.conf b/config/sources/families/spacemit.conf
index 7f7aee2ae4..06ea872ee5 100644
--- a/config/sources/families/spacemit.conf
+++ b/config/sources/families/spacemit.conf
@@ -24,7 +24,7 @@ declare -g BOOTSOURCE="https://gitee.com/bianbu-linux/uboot-2022.10.git"
 declare -g BOOTBRANCH="${BOOTBRANCH_BOARD:-"tag:k1-bl-v2.2.7-release"}"
 declare -g BOOTDIR='u-boot-spacemit'
 declare -g BOOTPATCHDIR="${BOOTPATCHDIR:-"legacy/u-boot-spacemit-k1"}"
-declare -g UBOOT_TARGET_MAP=";;bootinfo_emmc.bin FSBL.bin u-boot.itb fw_dynamic.itb"
+declare -g UBOOT_TARGET_MAP=";;bootinfo_emmc.bin bootinfo bootinfo_spinor.bin FSBL.bin fw_dynamic.itb u-boot.itb u-boot-env-default.bin"
 declare -g BOOTCONFIG="k1_defconfig" # Boot with generic SpacemiT K1 config
 
 # Linux
@@ -38,9 +38,9 @@ case "${BRANCH}" in
 		;;
 	edge)
 		declare -g KERNELSOURCE="https://github.com/jmontleon/linux-bianbu.git"
-		declare -g KERNELBRANCH="branch:linux-6.17.y"
+		declare -g KERNELBRANCH="branch:linux-6.18.y"
 		declare -g EXTRAWIFI="no" # WiFi drivers are already included in the kernel
-		declare -g KERNEL_MAJOR_MINOR="6.17"
+		declare -g KERNEL_MAJOR_MINOR="6.18"
 		declare -g LINUXCONFIG="linux-${LINUXFAMILY}-edge"
 		;;
 esac
@@ -70,12 +70,10 @@ write_uboot_platform() {
 		sleep .50
 		dd if="$1/bootinfo_emmc.bin" of="/dev/${DEVICE}" bs=512 conv=notrunc
 		dd if="$1/FSBL.bin" of="/dev/${DEVICE}" bs=512 seek=1 conv=notrunc
-		dd if="$1/FSBL.bin" of="/dev/${DEVICE}" bs=512 seek=512 conv=notrunc
 	else
-		echo "SD card"
+		echo "SDCARD"
 		dd if="$1/bootinfo_emmc.bin" of=$2 bs=512 conv=notrunc
 		dd if="$1/FSBL.bin" of="$2" bs=512 seek=1 conv=notrunc
-		dd if="$1/FSBL.bin" of="$2" bs=512 seek=512 conv=notrunc
 	fi
 	dd if="$1/fw_dynamic.itb" of="$2" bs=512 seek=1280 conv=notrunc
 	dd if="$1/u-boot.itb" of="$2" bs=512 seek=2048 conv=notrunc