diff --git a/conf/machine/freedom-u540.conf b/conf/machine/freedom-u540.conf
index 3af48f2..f704714 100644
--- a/conf/machine/freedom-u540.conf
+++ b/conf/machine/freedom-u540.conf
@@ -33,8 +33,6 @@ IMAGE_FSTYPES_append = " wic.gz ext4"
 # Do not update fstab file when using wic images
 WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update"
 
-IMAGE_BOOT_FILES = ""
-
 ### wic default support
 WKS_FILE_DEPENDS ?= " \
     opensbi \
@@ -42,6 +40,10 @@ WKS_FILE_DEPENDS ?= " \
     bmap-tools-native \
 "
 
+IMAGE_BOOT_FILES ?= " \
+    Image \
+"
+
 WKS_FILE ?= "freedom-u540-opensbi.wks"
 
 BAD_RECOMMENDATIONS += "\
diff --git a/recipes-kernel/linux/files/freedom-u540/defconfig b/recipes-kernel/linux/files/freedom-u540/defconfig
index bfa4fa3..5126cb8 100644
--- a/recipes-kernel/linux/files/freedom-u540/defconfig
+++ b/recipes-kernel/linux/files/freedom-u540/defconfig
@@ -17,7 +17,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SMP=y
 CONFIG_HZ_100=y
-CONFIG_CMDLINE="earlycon=sbi root=/dev/mmcblk0p2 rootwait"
+CONFIG_CMDLINE="earlycon=sbi root=/dev/mmcblk0p3 rootwait"
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
diff --git a/wic/freedom-u540-opensbi.wks b/wic/freedom-u540-opensbi.wks
index 365dbac..1f5a335 100644
--- a/wic/freedom-u540-opensbi.wks
+++ b/wic/freedom-u540-opensbi.wks
@@ -1,6 +1,7 @@
 # short-description: Create SD card image for HiFive Unleashed development board
 
-part opensbi --source rawcopy --sourceparams="file=fw_payload.bin" --ondisk mmcblk --size 32M --align 1 --part-type 2e54b353-1271-4842-806f-e436d6af6985
-part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 --size 5G
+part opensbi --source rawcopy --sourceparams="file=fw_payload.bin" --ondisk mmcblk0 --size 32M --align 1 --part-type 2e54b353-1271-4842-806f-e436d6af6985
+part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --size=100M --align 4096
+part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4096 --size 5G
 
 bootloader --ptable gpt