diff --git a/config/boards/khadas-vim3.wip b/config/boards/khadas-vim3.wip
new file mode 100644
index 0000000000..8cf231f29d
--- /dev/null
+++ b/config/boards/khadas-vim3.wip
@@ -0,0 +1,9 @@
+# Amlogic A311D 2/4GB RAM eMMC GBE USB3 M.2
+BOARD_NAME="Khadas VIM3"
+BOARDFAMILY="meson-g12b"
+BOOTCONFIG="khadas-vim3_defconfig"
+KERNEL_TARGET="edge"
+FULL_DESKTOP="yes"
+SERIALCON="ttyAML0"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="amlogic/meson-g12b-a311d-khadas-vim3.dtb" # mainline kernel also carries 'meson-g12b-s922x-khadas-vim3.dtb'
diff --git a/config/sources/families/meson-g12b.conf b/config/sources/families/meson-g12b.conf
index 13d05c3f50..36d2900f0b 100644
--- a/config/sources/families/meson-g12b.conf
+++ b/config/sources/families/meson-g12b.conf
@@ -28,9 +28,16 @@ else
 
 	# Handling of FIP blobs
 	uboot_custom_postprocess() {
-		# FIP trees 'odroid-n2-plus' and 'odroid-n2' are identical.
+		# @TODO: these should come from FIP_TREE_BOARD/FIP_TREE_FAMILY vars in board.conf instead of hardcoded here
 		if [[ $BOARD == odroidn2* ]]; then
+			# FIP trees 'odroid-n2-plus' and 'odroid-n2' are identical.
 			uboot_g12_postprocess "$SRC"/cache/sources/amlogic-boot-fip/odroid-n2 g12b
+		elif [[ $BOARD == khadas-vim3 ]]; then
+			# 'khadas-vim3' FIP tree contains 'lpddr3_1d.fw' which will trigger '--ddrfw9' in uboot_g12_postprocess
+			uboot_g12_postprocess "$SRC"/cache/sources/amlogic-boot-fip/khadas-vim3 g12b
+		else
+			echo "Don't know how to handle FIP trees for board '${BOARD}'"
+			exit 2
 		fi
 	}
 fi