diff --git a/openamp/Makefile b/openamp/Makefile
index 5aaf171681..8f8b89c71a 100644
--- a/openamp/Makefile
+++ b/openamp/Makefile
@@ -34,7 +34,7 @@ OBJS = $(AOBJS) $(COBJS)
 BIN = libopenamp$(LIBEXT)
 
 all: $(BIN)
-.PHONY: context depend clean distclean dirlinks
+.PHONY: context depend clean distclean
 
 $(AOBJS): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
@@ -45,7 +45,7 @@ $(COBJS): %$(OBJEXT): %.c
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
-dirlinks::
+context::
 
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
diff --git a/openamp/libmetal.defs b/openamp/libmetal.defs
index 2b9709ddb3..8cd2dc4121 100644
--- a/openamp/libmetal.defs
+++ b/openamp/libmetal.defs
@@ -76,7 +76,7 @@ libmetal.zip:
 	)
 	touch $@
 
-dirlinks:: .libmetal_headers
+context:: .libmetal_headers
 
 distclean::
 	$(call DELDIR, $(TOPDIR)$(DELIM)include$(DELIM)metal)
diff --git a/openamp/open-amp.defs b/openamp/open-amp.defs
index 3cc9a8566b..5fae35c8ba 100644
--- a/openamp/open-amp.defs
+++ b/openamp/open-amp.defs
@@ -43,7 +43,7 @@ open-amp.zip:
 	$(foreach header,$(headers),$(shell cp -rf $(header) $(TOPDIR)$(DELIM)include$(DELIM)openamp$(DELIM)))
 	touch $@
 
-dirlinks:: .openamp_headers
+context:: .openamp_headers
 
 distclean::
 	$(call DELDIR, $(TOPDIR)$(DELIM)include$(DELIM)openamp$(DELIM))
diff --git a/tools/Directories.mk b/tools/Directories.mk
index 4213a0bfbf..00ce04e0b8 100644
--- a/tools/Directories.mk
+++ b/tools/Directories.mk
@@ -159,6 +159,7 @@ endif
 
 ifeq ($(CONFIG_OPENAMP),y)
 KERNDEPDIRS += openamp
+CONTEXTDIRS += openamp
 else
 CLEANDIRS += openamp
 endif
diff --git a/tools/Makefile.unix b/tools/Makefile.unix
index 2c20ba1efe..3e0c9dbc89 100644
--- a/tools/Makefile.unix
+++ b/tools/Makefile.unix
@@ -327,7 +327,6 @@ endif
 
 dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip drivers/platform
 	$(Q) $(MAKE) -C boards dirlinks
-	$(Q) $(MAKE) -C openamp dirlinks
 	$(Q) $(MAKE) -C $(CONFIG_APPS_DIR) dirlinks
 
 # context
diff --git a/tools/Makefile.win b/tools/Makefile.win
index 9d755f9fee..180f62d68d 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -306,7 +306,6 @@ endif
 
 dirlinks: include\arch include\arch\board include\arch\chip $(ARCH_SRC)\board $(ARCH_SRC)\chip drivers\platform
 	$(Q) $(MAKE) -C boards dirlinks
-	$(Q) $(MAKE) -C openamp dirlinks
 	$(Q) $(MAKE) -C $(CONFIG_APPS_DIR) dirlinks
 
 # context