remove two patches that integrated into ACRN already

Signed-off-by: Alek Du <alek.du@intel.com>
This commit is contained in:
Alek Du 2019-01-18 01:54:13 +00:00
parent 274dfbd843
commit c3fc107710
4 changed files with 1 additions and 71 deletions

View File

@ -1,46 +0,0 @@
From d0f368de3346046cec06bfff79e223c309c6846d Mon Sep 17 00:00:00 2001
From: Alek Du <alek.du@intel.com>
Date: Wed, 19 Dec 2018 13:06:37 +0000
Subject: [PATCH 1/2] add install debug target
Rebased according to 2018ww51.2 acrn release.
Signed-off-by: Alek Du <alek.du@intel.com>
---
efi-stub/Makefile | 4 ++++
hypervisor/Makefile | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/efi-stub/Makefile b/efi-stub/Makefile
index f5390ca..da42a7d 100644
--- a/efi-stub/Makefile
+++ b/efi-stub/Makefile
@@ -89,6 +89,10 @@ all: $(EFIBIN)
install: $(EFIBIN) install-conf
install -D $(EFIBIN) $(DESTDIR)/usr/lib/acrn/$(HV_FILE).efi
+install-debug: $(HV_OBJDIR)/$(HV_FILE).map $(HV_OBJDIR)/$(HV_FILE).out
+ install -D $(HV_OBJDIR)/$(HV_FILE).out $(DESTDIR)/usr/lib/acrn/$(HV_FILE).efi.out
+ install -D $(HV_OBJDIR)/$(HV_FILE).map $(DESTDIR)/usr/lib/acrn/$(HV_FILE).efi.map
+
$(EFIBIN): $(BOOT)
$(EFI_OBJDIR)/boot.efi: $(EFI_OBJDIR)/boot.so
diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index c9e88ba..f9a002e 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -279,6 +279,10 @@ all: lib $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin
ifeq ($(CONFIG_PLATFORM_SBL),y)
install: lib $(HV_OBJDIR)/$(HV_FILE).32.out
install -D $(HV_OBJDIR)/$(HV_FILE).32.out $(DESTDIR)/usr/lib/acrn/$(HV_FILE).sbl
+
+install-debug: $(HV_OBJDIR)/$(HV_FILE).map $(HV_OBJDIR)/$(HV_FILE).out
+ install -D $(HV_OBJDIR)/$(HV_FILE).out $(DESTDIR)/usr/lib/acrn/$(HV_FILE).sbl.out
+ install -D $(HV_OBJDIR)/$(HV_FILE).map $(DESTDIR)/usr/lib/acrn/$(HV_FILE).sbl.map
endif
.PHONY: header
--
2.19.2

View File

@ -1,22 +0,0 @@
From b1dba35ed0950130ba46c348e7188277f3da8c6f Mon Sep 17 00:00:00 2001
From: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
Date: Tue, 9 Oct 2018 11:41:58 -0500
Subject: [PATCH 2/2] add RELEASE variable to make command
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 7da689dc..e45451d8 100644
--- a/Makefile
+++ b/Makefile
@@ -56,4 +56,4 @@ devicemodel-install:
make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install
tools-install:
- make -C $(T)/tools OUT_DIR=$(TOOLS_OUT) install
+ make -C $(T)/tools OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) install
--
2.19.1

4
series
View File

@ -1,3 +1 @@
#0001-add-install-debug-target.patch
#0002-add-RELEASE-variable-to-make-command.patch
0003-makefile-install-debug.patch
0001-makefile-install-debug.patch