From c3fc1077100ebb2a7f21c5e4b1d540bb79c8318f Mon Sep 17 00:00:00 2001
From: Alek Du <alek.du@intel.com>
Date: Fri, 18 Jan 2019 01:54:13 +0000
Subject: [PATCH] remove two patches that integrated into ACRN already

Signed-off-by: Alek Du <alek.du@intel.com>
---
 0001-add-install-debug-target.patch           | 46 -------------------
 ...patch => 0001-makefile-install-debug.patch |  0
 ...add-RELEASE-variable-to-make-command.patch | 22 ---------
 series                                        |  4 +-
 4 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 0001-add-install-debug-target.patch
 rename 0003-makefile-install-debug.patch => 0001-makefile-install-debug.patch (100%)
 delete mode 100644 0002-add-RELEASE-variable-to-make-command.patch

diff --git a/0001-add-install-debug-target.patch b/0001-add-install-debug-target.patch
deleted file mode 100644
index c2c6af3..0000000
--- a/0001-add-install-debug-target.patch
+++ /dev/null
@@ -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
-
diff --git a/0003-makefile-install-debug.patch b/0001-makefile-install-debug.patch
similarity index 100%
rename from 0003-makefile-install-debug.patch
rename to 0001-makefile-install-debug.patch
diff --git a/0002-add-RELEASE-variable-to-make-command.patch b/0002-add-RELEASE-variable-to-make-command.patch
deleted file mode 100644
index b5d827c..0000000
--- a/0002-add-RELEASE-variable-to-make-command.patch
+++ /dev/null
@@ -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
-
diff --git a/series b/series
index c65b75a..8065a03 100644
--- a/series
+++ b/series
@@ -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