Removed one useless makefile, and corrected some BSD licenses

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1025 6f19259b-4bc3-4df7-8a09-765794883524

8 files changed, 119 insertions, 176 deletions

diff --git a/Tools/Source/TianoTools/PeiRebase/makefile b/Tools/Source/TianoTools/PeiRebase/makefile
deleted file mode 100644
index 4b19309707..0000000000
--- a/Tools/Source/TianoTools/PeiRebase/makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#/*++

-#  

-#  Copyright (c) 2001 Intel Corporation.  All rights reserved.

-#

-#  This software and associated documentation (if any) is furnished under 

-#  a license and may only be used or copied in accordance with the terms 

-#  of the license.  Except as permitted by such license, no part of this 

-#  software or documentation may be reproduced, stored in a retrieval 

-#  system, or transmitted in any form or by any means without the express 

-#  written consent of Intel Corporation.

-#  

-#  Module Name:

-#  

-#    makefile

-#    

-#  Abstract:

-#  

-#    makefile for building the PeiRebase utility.

-#  

-#  Revision History

-#  

-#--*/

-

-#

-# Make sure environmental variable EFI_SOURCE is set

-#

-!IFNDEF EFI_SOURCE

-!ERROR EFI_SOURCE environmental variable not set 

-!ENDIF

-

-#

-# Do this if you want to compile from this directory

-#

-!IFNDEF TOOLCHAIN

-TOOLCHAIN = TOOLCHAIN_MSVC

-!ENDIF

-

-!INCLUDE PlatformTools.env

-

-#

-# Target specific information

-#

-

-TARGET_NAME         = PeiRebase

-TARGET_SRC_DIR      = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)

-TARGET_EXE          = $(TIANO_TOOLS_OUTPUT)\PeiRebase.exe

-TARGET_EXE_LIBS     = $(TIANO_TOOLS_OUTPUT)\Common.lib

-

-#

-# Build targets

-#

-

-all: $(TARGET_EXE)

-

-OBJECTS   = $(TIANO_TOOLS_OUTPUT)\PeiRebase.obj  

-

-#

-# Compile each source file

-#

-$(TIANO_TOOLS_OUTPUT)\PeiRebase.obj : $(TARGET_SRC_DIR)\PeiRebaseExe.c $(INC_DEPS) $(TARGET_EXE_LIBS)

-  $(CC) $(C_FLAGS) $(TARGET_SRC_DIR)\PeiRebaseExe.c /Fo$@

-

-#

-# Link the object files together

-#

-$(TARGET_EXE) : $(OBJECTS) $(TARGET_EXE_LIBS)

-  @echo LINKING

-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(OBJECTS)  $(TARGET_EXE_LIBS)

-

-clean:

-  @if exist $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL

diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h b/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
index ea40918f1d..6d234e3a18 100644
--- a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
+++ b/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
@@ -1,17 +1,17 @@
 /*++

 

-Copyright (c)  2005 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

+Copyright (c)  1999-2006 Intel Corporation. All rights reserved

+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.

 

 

 Module Name:

-  

+

   SecApResetVectorFixup.h

 

 Abstract:

diff --git a/Tools/Source/TianoTools/String/PrintLib.c b/Tools/Source/TianoTools/String/PrintLib.c
index 1e09e24d0b..d27db98ddd 100644
--- a/Tools/Source/TianoTools/String/PrintLib.c
+++ b/Tools/Source/TianoTools/String/PrintLib.c
@@ -1,22 +1,24 @@
-/** @file

-  Print Library.

-

+/*++

 

 Copyright (c)  2004-2006 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

+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.

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

-  Module Name:  PrintLib.c

 

-**/

+Module Name:

+

+  PrintLib.c

+

+Abstract:

+

+  Print Library.

+

+--*/

 

 #include <Common/UefiBaseTypes.h>

 #include <Library/PrintLib.h>

@@ -64,19 +66,19 @@ static CONST STATUS_LOOKUP_TABLE_ENTRY  StatusString[] = {
 

 

 /**

-  VSPrint function to process format and place the results in Buffer. Since a 

-  VA_LIST is used this rountine allows the nesting of Vararg routines. Thus 

+  VSPrint function to process format and place the results in Buffer. Since a

+  VA_LIST is used this rountine allows the nesting of Vararg routines. Thus

   this is the main print working routine

 

   @param  StartOfBuffer Unicode buffer to print the results of the parsing of Format into.

-  

+

   @param  BufferSize Maximum number of characters to put into buffer. Zero means

   no limit.

-  

+

   @param  Flags Intial flags value.  Can only have FORMAT_UNICODE and OUTPUT_UNICODE set

-  

+

   @param  FormatString Unicode format string see file header for more details.

-  

+

   @param  Marker Vararg list consumed by processing Format.

 

   @return Number of characters printed.

@@ -172,24 +174,24 @@ BasePrintLibVSPrint (
         Format += BytesPerFormatCharacter;

         FormatCharacter = (*Format | (*(Format + 1) << 8)) & FormatMask;

         switch (FormatCharacter) {

-        case '.': 

-          Flags |= PRECISION; 

+        case '.':

+          Flags |= PRECISION;

           break;

-        case '-': 

-          Flags |= LEFT_JUSTIFY; 

+        case '-':

+          Flags |= LEFT_JUSTIFY;

           break;

-        case '+': 

-          Flags |= PREFIX_SIGN;  

+        case '+':

+          Flags |= PREFIX_SIGN;

           break;

-        case ' ': 

-          Flags |= PREFIX_BLANK; 

+        case ' ':

+          Flags |= PREFIX_BLANK;

           break;

-        case ',': 

-          Flags |= COMMA_TYPE; 

+        case ',':

+          Flags |= COMMA_TYPE;

           break;

         case 'L':

-        case 'l': 

-          Flags |= LONG_TYPE;    

+        case 'l':

+          Flags |= LONG_TYPE;

           break;

         case '*':

           if ((Flags & PRECISION) == 0) {

@@ -229,7 +231,7 @@ BasePrintLibVSPrint (
           Done = TRUE;

           break;

         }

-      } 

+      }

 

       //

       // Limit the maximum field width to the remaining characters in the output buffer

@@ -338,7 +340,7 @@ BasePrintLibVSPrint (
         } else {

           BasePrintLibSPrint (

             ValueBuffer,

-            0, 

+            0,

             0,

             "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",

             TmpGuid->Data1,

@@ -358,7 +360,7 @@ BasePrintLibVSPrint (
         break;

 

       case 't':

-        TmpTime = VA_ARG (Marker, TIME *); 

+        TmpTime = VA_ARG (Marker, TIME *);

         if (TmpTime == NULL) {

           ArgumentString = "<null time>";

         } else {

@@ -519,7 +521,7 @@ BasePrintLibVSPrint (
   // Null terminate the Unicode or ASCII string

   //

   Buffer = BasePrintLibFillBuffer (Buffer, 1, 0, BytesPerOutputCharacter);

-   

+

   return ((Buffer - OriginalBuffer) / BytesPerOutputCharacter);

 }

 

diff --git a/Tools/Source/TianoTools/String/PrintLibInternal.c b/Tools/Source/TianoTools/String/PrintLibInternal.c
index 60e8bba0df..63d0c7196f 100644
--- a/Tools/Source/TianoTools/String/PrintLibInternal.c
+++ b/Tools/Source/TianoTools/String/PrintLibInternal.c
@@ -1,22 +1,24 @@
-/** @file

-  Print Library worker functions.

-

+/*++

 

 Copyright (c)  2004-2006 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

+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.

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

-  Module Name:  PrintLibInternal.c

 

-**/

+Module Name:

+

+  PrintLibInternal.c

+

+Abstract:

+

+  Print Library worker functions.

+

+--*/

 

 #include <Common/UefiBaseTypes.h>

 #include <Library/PrintLib.h>

@@ -48,11 +50,11 @@ BasePrintLibFillBuffer (
   Print worker function that prints a Value as a decimal number in Buffer.

 

   @param  Buffer Location to place the Unicode or ASCII string of Value.

-  

+

   @param  Value Value to convert to a Decimal or Hexidecimal string in Buffer.

-  

+

   @param  Flags Flags to use in printing string, see file header for details.

-  

+

   @param  Precision Minimum number of digits to return in the ASCII string

 

   @return Number of characters printed.

diff --git a/Tools/Source/TianoTools/String/PrintLibInternal.h b/Tools/Source/TianoTools/String/PrintLibInternal.h
index 0a2cfb48d4..87f0955e05 100644
--- a/Tools/Source/TianoTools/String/PrintLibInternal.h
+++ b/Tools/Source/TianoTools/String/PrintLibInternal.h
@@ -1,21 +1,24 @@
-/** @file

-  Print Library.

+/*++

 

 Copyright (c)  2004-2006 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

+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.

+

 

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+Module Name:

 

-  Module Name:  PrintLibInternal.h

+  PrintLibInternal.h

+

+Abstract:

+

+  Print Library.

 

-**/

+--*/

 

 

 

@@ -83,8 +86,8 @@ BasePrintLibFillBuffer (
 UINTN

 EFIAPI

 BasePrintLibValueToString (

-  IN OUT CHAR8  *Buffer, 

-  IN INT64      Value, 

+  IN OUT CHAR8  *Buffer,

+  IN INT64      Value,

   IN UINTN      Radix

   );

 

diff --git a/Tools/Source/TianoTools/String/String.c b/Tools/Source/TianoTools/String/String.c
index 9e02231f36..cdbf29964c 100644
--- a/Tools/Source/TianoTools/String/String.c
+++ b/Tools/Source/TianoTools/String/String.c
@@ -1,21 +1,24 @@
-/** @file

-  Unicode string primatives.

+/*++

 

 Copyright (c)  2004-2006 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

+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.

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

-  Module Name:  String.c

 

-**/

+Module Name:

+

+  String.c

+

+Abstract:

+

+  Unicode and ASCII string primatives.

+

+--*/

 

 #include <assert.h>

 

diff --git a/Tools/Source/TianoTools/Strip/Strip.c b/Tools/Source/TianoTools/Strip/Strip.c
index 35f1413445..c21c4413e2 100644
--- a/Tools/Source/TianoTools/Strip/Strip.c
+++ b/Tools/Source/TianoTools/Strip/Strip.c
@@ -1,13 +1,14 @@
 /*++

 

 Copyright (c)  2004-2006 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

+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.

+

 

 Module Name:

 

@@ -42,7 +43,7 @@ Arguments:
 Returns:

 

   Zero     - Function completed successfully.

-  Non-zero - Function exited with errors. 

+  Non-zero - Function exited with errors.

 

 --*/

 {

diff --git a/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c b/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
index 6e454f2de2..caf129b429 100644
--- a/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
+++ b/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
@@ -1,18 +1,21 @@
 /*++

 

 Copyright (c)  2004-2006 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

+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.

+

 

 Module Name:

+

   ZeroDebugData.c

 

 Abstract:

+

   Zero the Debug Data Fields of Portable Executable (PE) format file.

 

 --*/