diff --git a/boards/Board.mk b/boards/Board.mk
index 29ebe291ba..51875d623e 100644
--- a/boards/Board.mk
+++ b/boards/Board.mk
@@ -123,9 +123,7 @@ endif
 
 depend: .depend
 
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
+context::
 
 clean:
 	$(call DELFILE, libboard$(LIBEXT))
diff --git a/boards/xtensa/esp32/esp32-core/src/Makefile b/boards/xtensa/esp32/esp32-core/src/Makefile
index 5ec8d6169e..2d23db4c30 100644
--- a/boards/xtensa/esp32/esp32-core/src/Makefile
+++ b/boards/xtensa/esp32/esp32-core/src/Makefile
@@ -60,7 +60,6 @@ endif
 SCRIPTIN = $(SCRIPTDIR)$(DELIM)esp32.template
 SCRIPTOUT = $(SCRIPTDIR)$(DELIM)esp32_out.ld
 
-BOARD_CONTEXT = y
 EXTRA_DISTCLEAN = $(call DELFILE, $(SCRIPTOUT))
 
 .PHONY = context
@@ -70,4 +69,4 @@ include $(TOPDIR)/boards/Board.mk
 $(SCRIPTOUT): $(SCRIPTIN) $(CONFIGFILE)
 	$(Q) $(CC) -isystem $(TOPDIR)/include -C -P -x c -E $(SCRIPTIN) -o $@
 
-context: $(SCRIPTOUT)
+context:: $(SCRIPTOUT)