public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH] OvmfPkg/ResetVector: Remove the unused ASM ResetVector.
@ 2016-11-03 21:40 Marvin Häuser
  2016-11-03 23:46 ` Laszlo Ersek
  0 siblings, 1 reply; 3+ messages in thread
From: Marvin Häuser @ 2016-11-03 21:40 UTC (permalink / raw)
  To: edk2-devel@lists.01.org; +Cc: jordan.l.justen@intel.com, lersek@redhat.com

Remove the ResetVector.asm file as it is no longer referenced since
the switch to ResetVector.nasmb.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
---
 OvmfPkg/ResetVector/ResetVectorCode.asm | 53 --------------------
 1 file changed, 53 deletions(-)

diff --git a/OvmfPkg/ResetVector/ResetVectorCode.asm b/OvmfPkg/ResetVector/ResetVectorCode.asm
deleted file mode 100644
index 052c821f212c..000000000000
--- a/OvmfPkg/ResetVector/ResetVectorCode.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-;------------------------------------------------------------------------------
-; @file
-; This file includes all other code files to assemble the reset vector code
-;
-; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>
-; This program and the accompanying materials
-; are licensed and made available under the terms and conditions of the BSD License
-; which accompanies this distribution.  The full text of the license may be found at
-; http://opensource.org/licenses/bsd-license.php
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-;
-;------------------------------------------------------------------------------
-
-%ifdef ARCH_IA32
-  %ifdef ARCH_X64
-    %error "Only one of ARCH_IA32 or ARCH_X64 can be defined."
-  %endif
-%elifdef ARCH_X64
-%else
-  %error "Either ARCH_IA32 or ARCH_X64 must be defined."
-%endif
-
-%include "CommonMacros.inc"
-
-%include "PostCodes.inc"
-
-%ifdef DEBUG_NONE
-  %include "DebugDisabled.asm"
-%elifdef DEBUG_PORT80
-  %include "Port80Debug.asm"
-%elifdef DEBUG_SERIAL
-  %include "SerialDebug.asm"
-%else
-  %error "No debug type was specified."
-%endif
-
-%include "Ia32/SearchForBfvBase.asm"
-%include "Ia32/SearchForSecEntry.asm"
-
-%ifdef ARCH_X64
-%include "Ia32/Flat32ToFlat64.asm"
-%include "Ia32/PageTables64.asm"
-%endif
-
-%include "Ia16/Real16ToFlat32.asm"
-%include "Ia16/Init16.asm"
-
-%include "Main.asm"
-
-%include "Ia16/ResetVectorVtf0.asm"
-
-- 
2.10.1.windows.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] OvmfPkg/ResetVector: Remove the unused ASM ResetVector.
  2016-11-03 21:40 [PATCH] OvmfPkg/ResetVector: Remove the unused ASM ResetVector Marvin Häuser
@ 2016-11-03 23:46 ` Laszlo Ersek
  2016-11-03 23:53   ` Jordan Justen
  0 siblings, 1 reply; 3+ messages in thread
From: Laszlo Ersek @ 2016-11-03 23:46 UTC (permalink / raw)
  To: Marvin Häuser, edk2-devel@lists.01.org; +Cc: jordan.l.justen@intel.com

On 11/03/16 22:40, Marvin Häuser wrote:
> Remove the ResetVector.asm file as it is no longer referenced since
> the switch to ResetVector.nasmb.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
> ---
>  OvmfPkg/ResetVector/ResetVectorCode.asm | 53 --------------------
>  1 file changed, 53 deletions(-)

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Jordan, do you think you could commit this patch? It's 00:46 here. :/

Thanks
Laszlo

> diff --git a/OvmfPkg/ResetVector/ResetVectorCode.asm b/OvmfPkg/ResetVector/ResetVectorCode.asm
> deleted file mode 100644
> index 052c821f212c..000000000000
> --- a/OvmfPkg/ResetVector/ResetVectorCode.asm
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -;------------------------------------------------------------------------------
> -; @file
> -; This file includes all other code files to assemble the reset vector code
> -;
> -; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>
> -; This program and the accompanying materials
> -; are licensed and made available under the terms and conditions of the BSD License
> -; which accompanies this distribution.  The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> -;
> -;------------------------------------------------------------------------------
> -
> -%ifdef ARCH_IA32
> -  %ifdef ARCH_X64
> -    %error "Only one of ARCH_IA32 or ARCH_X64 can be defined."
> -  %endif
> -%elifdef ARCH_X64
> -%else
> -  %error "Either ARCH_IA32 or ARCH_X64 must be defined."
> -%endif
> -
> -%include "CommonMacros.inc"
> -
> -%include "PostCodes.inc"
> -
> -%ifdef DEBUG_NONE
> -  %include "DebugDisabled.asm"
> -%elifdef DEBUG_PORT80
> -  %include "Port80Debug.asm"
> -%elifdef DEBUG_SERIAL
> -  %include "SerialDebug.asm"
> -%else
> -  %error "No debug type was specified."
> -%endif
> -
> -%include "Ia32/SearchForBfvBase.asm"
> -%include "Ia32/SearchForSecEntry.asm"
> -
> -%ifdef ARCH_X64
> -%include "Ia32/Flat32ToFlat64.asm"
> -%include "Ia32/PageTables64.asm"
> -%endif
> -
> -%include "Ia16/Real16ToFlat32.asm"
> -%include "Ia16/Init16.asm"
> -
> -%include "Main.asm"
> -
> -%include "Ia16/ResetVectorVtf0.asm"
> -
> 



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] OvmfPkg/ResetVector: Remove the unused ASM ResetVector.
  2016-11-03 23:46 ` Laszlo Ersek
@ 2016-11-03 23:53   ` Jordan Justen
  0 siblings, 0 replies; 3+ messages in thread
From: Jordan Justen @ 2016-11-03 23:53 UTC (permalink / raw)
  To: Laszlo Ersek, Marvin Häuser, edk2-devel@lists.01.org

On 2016-11-03 16:46:18, Laszlo Ersek wrote:
> On 11/03/16 22:40, Marvin Häuser wrote:
> > Remove the ResetVector.asm file as it is no longer referenced since
> > the switch to ResetVector.nasmb.
> > 
> > Contributed-under: TianoCore Contribution Agreement 1.0
> > Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
> > ---
> >  OvmfPkg/ResetVector/ResetVectorCode.asm | 53 --------------------
> >  1 file changed, 53 deletions(-)
> 
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> 
> Jordan, do you think you could commit this patch? It's 00:46 here. :/
> 

Sure. I'll commit this one, and we can sort out the second patch
tomorrow.

Thanks,

-Jordan

> 
> > diff --git a/OvmfPkg/ResetVector/ResetVectorCode.asm b/OvmfPkg/ResetVector/ResetVectorCode.asm
> > deleted file mode 100644
> > index 052c821f212c..000000000000
> > --- a/OvmfPkg/ResetVector/ResetVectorCode.asm
> > +++ /dev/null
> > @@ -1,53 +0,0 @@
> > -;------------------------------------------------------------------------------
> > -; @file
> > -; This file includes all other code files to assemble the reset vector code
> > -;
> > -; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>
> > -; This program and the accompanying materials
> > -; are licensed and made available under the terms and conditions of the BSD License
> > -; which accompanies this distribution.  The full text of the license may be found at
> > -; http://opensource.org/licenses/bsd-license.php
> > -;
> > -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> > -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> > -;
> > -;------------------------------------------------------------------------------
> > -
> > -%ifdef ARCH_IA32
> > -  %ifdef ARCH_X64
> > -    %error "Only one of ARCH_IA32 or ARCH_X64 can be defined."
> > -  %endif
> > -%elifdef ARCH_X64
> > -%else
> > -  %error "Either ARCH_IA32 or ARCH_X64 must be defined."
> > -%endif
> > -
> > -%include "CommonMacros.inc"
> > -
> > -%include "PostCodes.inc"
> > -
> > -%ifdef DEBUG_NONE
> > -  %include "DebugDisabled.asm"
> > -%elifdef DEBUG_PORT80
> > -  %include "Port80Debug.asm"
> > -%elifdef DEBUG_SERIAL
> > -  %include "SerialDebug.asm"
> > -%else
> > -  %error "No debug type was specified."
> > -%endif
> > -
> > -%include "Ia32/SearchForBfvBase.asm"
> > -%include "Ia32/SearchForSecEntry.asm"
> > -
> > -%ifdef ARCH_X64
> > -%include "Ia32/Flat32ToFlat64.asm"
> > -%include "Ia32/PageTables64.asm"
> > -%endif
> > -
> > -%include "Ia16/Real16ToFlat32.asm"
> > -%include "Ia16/Init16.asm"
> > -
> > -%include "Main.asm"
> > -
> > -%include "Ia16/ResetVectorVtf0.asm"
> > -
> > 
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-11-03 23:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-03 21:40 [PATCH] OvmfPkg/ResetVector: Remove the unused ASM ResetVector Marvin Häuser
2016-11-03 23:46 ` Laszlo Ersek
2016-11-03 23:53   ` Jordan Justen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox