diff --git a/core/envsetup.mk b/core/envsetup.mk
index 04bfe49..3d76fef 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -260,6 +260,13 @@
   endif
 endif
 
+# Check BOARD_VNDK_VERSION
+ifdef BOARD_VNDK_VERSION
+  ifneq ($(BOARD_VNDK_VERSION),current)
+    $(error BOARD_VNDK_VERSION: Only "current" is implemented)
+  endif
+endif
+
 # ---------------------------------------------------------------
 # Set up configuration for target machine.
 # The following must be set: