diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample
index 1d4d4a5..0640c11 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample
@@ -13,6 +13,7 @@
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-arm/meta-arm \
   ##OEROOT##/meta-arm/meta-arm-toolchain \
+  ##OEROOT##/meta-arm/meta-arm-bsp \
   ##OEROOT##/meta-nuvoton \
   ##OEROOT##/meta-nuvoton/meta-evb-npcm845 \
   ##OEROOT##/meta-evb \
diff --git a/meta-nuvoton/conf/machine/include/npcm8xx.inc b/meta-nuvoton/conf/machine/include/npcm8xx.inc
index 1605363..24956a2 100644
--- a/meta-nuvoton/conf/machine/include/npcm8xx.inc
+++ b/meta-nuvoton/conf/machine/include/npcm8xx.inc
@@ -43,6 +43,7 @@
 
 COMPATIBLE_MACHINE:npcm8xx = "npcm8xx"
 TFA_PLATFORM = "npcm845x"
+PREFERRED_VERSION_trusted-firmware-a ?= "2.9.%"
 
 # Nuvoton prefers optee for BL32.
 TFA_SPD = "opteed"