diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
index 66e0cc3..0a1275e 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
@@ -29,8 +29,8 @@ EDK2_PLATFORM_DSC  = ""
 EDK2_BIN_NAME      = ""
 # build --arch
 EDK2_ARCH          = ""
-# Extra arguments passed to build
-EDK2_EXTRA_BUILD   = ""
+# Extra arguments passed to build. Pass --platform if it is set
+EDK2_EXTRA_BUILD:append   = "${@' --platform ${EDK2_PLATFORM_DSC}' if '${EDK2_PLATFORM_DSC}' else ''}"
 
 # build --buildtarget
 EDK2_BUILD_MODE ?= "${@bb.utils.contains('EDK2_BUILD_RELEASE', '1', 'RELEASE', 'DEBUG', d)}"
@@ -84,7 +84,6 @@ do_compile() {
        --arch "${EDK2_ARCH}" \
        --buildtarget ${EDK2_BUILD_MODE} \
        --tagname ${EDK_COMPILER} \
-       --platform ${EDK2_PLATFORM_DSC} \
        ${EDK2_EXTRA_BUILD}
 }