From 0d52f933da5efe7a02f04973ec6d7ed9b8796724 Mon Sep 17 00:00:00 2001
From: Victor Sun <victor.sun@intel.com>
Date: Tue, 12 Nov 2019 14:11:58 +0800
Subject: [PATCH] Makefile: move .mk file to hv scripts folder

The *.mk files under misc/acrn-config/library are all rules for hypervisor
makefiles only, so move these files to hypervisor/scripts/makefile/ folder.

The folder of acrn-config/library/ will be used to store python script lib only.

Tracked-On: #3779

Signed-off-by: Victor Sun <victor.sun@intel.com>
Reviewed-by: Terry Zou <terry.zou@intel.com>
---
 Makefile                                                    | 2 +-
 hypervisor/Makefile                                         | 6 +++---
 .../library => hypervisor/scripts/makefile}/cfg_update.mk   | 0
 .../library => hypervisor/scripts/makefile}/deps.mk         | 0
 hypervisor/scripts/{kconfig => makefile}/kconfig.mk         | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {misc/acrn-config/library => hypervisor/scripts/makefile}/cfg_update.mk (100%)
 rename {misc/acrn-config/library => hypervisor/scripts/makefile}/deps.mk (100%)
 rename hypervisor/scripts/{kconfig => makefile}/kconfig.mk (100%)

diff --git a/Makefile b/Makefile
index 873444065..cbd5c0ef9 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ endif
 #     default value defined in this make file will be used
 #
 
-include $(T)/misc/acrn-config/library/cfg_update.mk
+include $(T)/hypervisor/scripts/makefile/cfg_update.mk
 
 ifeq ($(DEFAULT_MENU_CONFIG_FILE), $(wildcard $(DEFAULT_MENU_CONFIG_FILE)))
   BOARD_IN_MENUCONFIG := $(shell grep CONFIG_BOARD= $(DEFAULT_MENU_CONFIG_FILE) | awk -F '"' '{print $$2}')
diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index 9b92991dc..9b9af3783 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -44,11 +44,11 @@ ARCH_LDFLAGS :=
 .PHONY: default
 default: all
 
-include $(BASEDIR)/../misc/acrn-config/library/cfg_update.mk
+include scripts/makefile/cfg_update.mk
 
-include $(BASEDIR)/../misc/acrn-config/library/deps.mk
+include scripts/makefile/deps.mk
 
-include scripts/kconfig/kconfig.mk
+include scripts/makefile/kconfig.mk
 
 #initialize scenarios name
 ifeq ($(CONFIG_SDC),y)
diff --git a/misc/acrn-config/library/cfg_update.mk b/hypervisor/scripts/makefile/cfg_update.mk
similarity index 100%
rename from misc/acrn-config/library/cfg_update.mk
rename to hypervisor/scripts/makefile/cfg_update.mk
diff --git a/misc/acrn-config/library/deps.mk b/hypervisor/scripts/makefile/deps.mk
similarity index 100%
rename from misc/acrn-config/library/deps.mk
rename to hypervisor/scripts/makefile/deps.mk
diff --git a/hypervisor/scripts/kconfig/kconfig.mk b/hypervisor/scripts/makefile/kconfig.mk
similarity index 100%
rename from hypervisor/scripts/kconfig/kconfig.mk
rename to hypervisor/scripts/makefile/kconfig.mk