1 files changed, 5 insertions, 4 deletions
diff --git a/config.mk b/config.mk
index aeafbd4c98..5ee6c783a8 100644
--- a/config.mk
+++ b/config.mk
@@ -201,10 +201,6 @@ ifneq ($(OBJTREE),$(SRCTREE))
 CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include
 endif
 
-ifdef VBOOT
-CPPFLAGS += -I$(VBOOT)/include/vboot
-endif
-
 ifdef DEV_TREE_SEPARATE
 CPPFLAGS += -DCONFIG_OF_SEPARATE
 endif
@@ -213,6 +209,11 @@ CPPFLAGS += -I$(TOPDIR)/include
 CPPFLAGS += -fno-builtin -ffreestanding -nostdinc	\
 	-isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)
 
+ifdef VBOOT
+CPPFLAGS += -I$(if $(VBOOT_SOURCE),$(VBOOT_SOURCE)/firmware/include,\
+		$(VBOOT)/include/vboot)
+endif
+
 ifdef BUILD_TAG
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes \
 	-DBUILD_TAG='"$(BUILD_TAG)"'