diff --git a/meta-nuvoton/conf/machine/include/nuvoton.inc b/meta-nuvoton/conf/machine/include/nuvoton.inc
index 9662af9..2673e3b 100644
--- a/meta-nuvoton/conf/machine/include/nuvoton.inc
+++ b/meta-nuvoton/conf/machine/include/nuvoton.inc
@@ -3,5 +3,14 @@
 PREFERRED_PROVIDER_u-boot ?= "u-boot-nuvoton"
 PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils-nuvoton"
 
+WKS_FILE ?= "emmc-nuvoton.wks.in"
+WKS_FILE_DEPENDS ?= " \
+    virtual/kernel \
+"
+WKS_RWFS_SIZE ??= "256M"
+WKS_ROFS_SIZE ??= "256M"
+IMAGE_BOOT_FILES ?= "fitImage-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE};fitImage"
+IMAGE_FSTYPES:remove:df-phosphor-mmc = "mtd-static mtd-static-tar mtd-static-alltar"
+
 MACHINEOVERRIDES .= ":nuvoton"
 MACHINE_EXTRA_RRECOMMENDS += "udev-nuvoton-mtd-partitions"
diff --git a/meta-nuvoton/recipes-bsp/u-boot/files/u-boot-emmc.cfg b/meta-nuvoton/recipes-bsp/u-boot/files/u-boot-emmc.cfg
new file mode 100644
index 0000000..4bc6522
--- /dev/null
+++ b/meta-nuvoton/recipes-bsp/u-boot/files/u-boot-emmc.cfg
@@ -0,0 +1,5 @@
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_PART=y
+CONFIG_CMD_UNZIP=y
diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
index 3ecb4a4..d4c4697 100644
--- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
+++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "U-boot for Nuvoton NPCM7xx Baseboard Management Controller"
+DESCRIPTION = "U-boot for Nuvoton NPCM7xx/NPCM8xx Baseboard Management Controller"
 
 require u-boot-common-nuvoton.inc
 require u-boot-nuvoton.inc
@@ -6,3 +6,5 @@
 PROVIDES += "u-boot"
 
 DEPENDS += "dtc-native"
+
+SRC_URI:append:df-phosphor-mmc = " file://u-boot-emmc.cfg"
diff --git a/meta-nuvoton/wic/emmc-nuvoton.wks.in b/meta-nuvoton/wic/emmc-nuvoton.wks.in
new file mode 100644
index 0000000..6e2e054
--- /dev/null
+++ b/meta-nuvoton/wic/emmc-nuvoton.wks.in
@@ -0,0 +1,32 @@
+# short-description: Create an image for eMMC
+# long-description: Creates an eMMC card image for the User Data Area that can
+# be used with the Nuvoton SoC family.
+#
+# Assumes a minimum flash size of 1GB.
+# Assumes U-Boot is stored elsewhere, such as an eMMC boot volume or NOR flash.
+#
+#  --- - ---------- -------- -------- -------- -------- ------ -------
+# |GPT| | reserved | boot-a | boot-b | rofs-a | rofs-b | rwfs |GPT-sec|
+#  --- - ---------- -------- -------- -------- -------- ------ -------
+#       ^   1MB       64MB     64MB    256MB    256MB    256MB
+#       |
+#       0x5000
+#
+# Primary GPT size (Beginning of image):
+# 512B (Protective MBR) + 512B (Primary Header) + 16KB (Primary Table)
+# First partition (u-boot-env) is 4K-aligned, which puts it at offset 0x5000
+#
+# Secondary GPT size (End of image):
+# 16KB (Secondary Table) + 512B (Secondary Header)
+
+bootloader --ptable gpt
+
+# Hint: bootimg-partition size must be same as MMC_BOOT_PARTITION_SIZE
+# Note: the partition layout above is SoC default value, it may change by user
+#       set WKS_ROFS_SIZE, WKS_RWFS_SIZE or MMC_BOOT_PARTITION_SIZE.
+part --align 4 --fixed-size 1M
+part --fstype=ext4 --fixed-size ${MMC_BOOT_PARTITION_SIZE}K --source bootimg-partition --label boot-a
+part --fstype=ext4 --fixed-size ${MMC_BOOT_PARTITION_SIZE}K --source bootimg-partition --label boot-b
+part --fstype=ext4 --fixed-size ${WKS_ROFS_SIZE} --source rootfs --label rofs-a
+part --fstype=ext4 --fixed-size ${WKS_ROFS_SIZE} --source rootfs --label rofs-b
+part --fstype=ext4 --fixed-size ${WKS_RWFS_SIZE} --label rwfs