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

diff --git a/Tools/Source/TianoTools/PeiRebase/makefile b/Tools/Source/TianoTools/PeiRebase/makefile
deleted file mode 100644 (file)
index 4b19309..0000000
--- a/Tools/Source/TianoTools/PeiRebase/makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#/*++\r
-#  \r
-#  Copyright (c) 2001 Intel Corporation.  All rights reserved.\r
-#\r
-#  This software and associated documentation (if any) is furnished under \r
-#  a license and may only be used or copied in accordance with the terms \r
-#  of the license.  Except as permitted by such license, no part of this \r
-#  software or documentation may be reproduced, stored in a retrieval \r
-#  system, or transmitted in any form or by any means without the express \r
-#  written consent of Intel Corporation.\r
-#  \r
-#  Module Name:\r
-#  \r
-#    makefile\r
-#    \r
-#  Abstract:\r
-#  \r
-#    makefile for building the PeiRebase utility.\r
-#  \r
-#  Revision History\r
-#  \r
-#--*/\r
-\r
-#\r
-# Make sure environmental variable EFI_SOURCE is set\r
-#\r
-!IFNDEF EFI_SOURCE\r
-!ERROR EFI_SOURCE environmental variable not set \r
-!ENDIF\r
-\r
-#\r
-# Do this if you want to compile from this directory\r
-#\r
-!IFNDEF TOOLCHAIN\r
-TOOLCHAIN = TOOLCHAIN_MSVC\r
-!ENDIF\r
-\r
-!INCLUDE PlatformTools.env\r
-\r
-#\r
-# Target specific information\r
-#\r
-\r
-TARGET_NAME         = PeiRebase\r
-TARGET_SRC_DIR      = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)\r
-TARGET_EXE          = $(TIANO_TOOLS_OUTPUT)\PeiRebase.exe\r
-TARGET_EXE_LIBS     = $(TIANO_TOOLS_OUTPUT)\Common.lib\r
-\r
-#\r
-# Build targets\r
-#\r
-\r
-all: $(TARGET_EXE)\r
-\r
-OBJECTS   = $(TIANO_TOOLS_OUTPUT)\PeiRebase.obj  \r
-\r
-#\r
-# Compile each source file\r
-#\r
-$(TIANO_TOOLS_OUTPUT)\PeiRebase.obj : $(TARGET_SRC_DIR)\PeiRebaseExe.c $(INC_DEPS) $(TARGET_EXE_LIBS)\r
-  $(CC) $(C_FLAGS) $(TARGET_SRC_DIR)\PeiRebaseExe.c /Fo$@\r
-\r
-#\r
-# Link the object files together\r
-#\r
-$(TARGET_EXE) : $(OBJECTS) $(TARGET_EXE_LIBS)\r
-  @echo LINKING\r
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(OBJECTS)  $(TARGET_EXE_LIBS)\r
-\r
-clean:\r
-  @if exist $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL\r

diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h b/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
index ea40918f1d8511129fd21a0a947e07741b48f19a..6d234e3a18b3f3960fcf4ed3ab6b4c72b162b5d2 100644 (file)
--- a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
+++ b/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
@@ -1,17 +1,17 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c)  2005 Intel Corporation. All rights reserved\r
-This software and associated documentation (if any) is furnished\r
-under a license and may only be used or copied in accordance\r
-with the terms of the license. Except as permitted by such\r
-license, no part of this software or documentation may be\r
-reproduced, stored in a retrieval system, or transmitted in any\r
-form or by any means without the express written consent of\r
-Intel Corporation.\r
+Copyright (c)  1999-2006 Intel Corporation. All rights reserved\r
+This program and the accompanying materials are licensed and made available\r
+under the terms and conditions of the BSD License which accompanies this\r
+distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 \r
 Module Name:\r
 \r
 \r
 Module Name:\r

-  \r
+\r

   SecApResetVectorFixup.h\r
 \r
 Abstract:\r
   SecApResetVectorFixup.h\r
 \r
 Abstract:\r

diff --git a/Tools/Source/TianoTools/String/PrintLib.c b/Tools/Source/TianoTools/String/PrintLib.c
index 1e09e24d0bbb18b993e4f6b50cc6c5d4f8911fc0..d27db98ddd032089f6583987cd44326d343a99e9 100644 (file)
--- a/Tools/Source/TianoTools/String/PrintLib.c
+++ b/Tools/Source/TianoTools/String/PrintLib.c
@@ -1,22 +1,24 @@
-/** @file\r
-  Print Library.\r
-\r
+/*++\r

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

-This software and associated documentation (if any) is furnished\r
-under a license and may only be used or copied in accordance\r
-with the terms of the license. Except as permitted by such\r
-license, no part of this software or documentation may be\r
-reproduced, stored in a retrieval system, or transmitted in any\r
-form or by any means without the express written consent of\r
-Intel Corporation.\r
+This program and the accompanying materials are licensed and made available\r
+under the terms and conditions of the BSD License which accompanies this\r
+distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 \r

-  Module Name:  PrintLib.c\r

 \r
 \r

-**/\r
+Module Name:\r
+\r
+  PrintLib.c\r
+\r
+Abstract:\r
+\r
+  Print Library.\r
+\r
+--*/\r

 \r
 #include <Common/UefiBaseTypes.h>\r
 #include <Library/PrintLib.h>\r
 \r
 #include <Common/UefiBaseTypes.h>\r
 #include <Library/PrintLib.h>\r


@@ -64,19 +66,19 @@ static CONST STATUS_LOOKUP_TABLE_ENTRY  StatusString[] = {
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  VSPrint function to process format and place the results in Buffer. Since a \r
-  VA_LIST is used this rountine allows the nesting of Vararg routines. Thus \r
+  VSPrint function to process format and place the results in Buffer. Since a\r
+  VA_LIST is used this rountine allows the nesting of Vararg routines. Thus\r

   this is the main print working routine\r
 \r
   @param  StartOfBuffer Unicode buffer to print the results of the parsing of Format into.\r
   this is the main print working routine\r
 \r
   @param  StartOfBuffer Unicode buffer to print the results of the parsing of Format into.\r

-  \r
+\r

   @param  BufferSize Maximum number of characters to put into buffer. Zero means\r
   no limit.\r
   @param  BufferSize Maximum number of characters to put into buffer. Zero means\r
   no limit.\r

-  \r
+\r

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

-  \r
+\r

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

-  \r
+\r

   @param  Marker Vararg list consumed by processing Format.\r
 \r
   @return Number of characters printed.\r
   @param  Marker Vararg list consumed by processing Format.\r
 \r
   @return Number of characters printed.\r


@@ -172,24 +174,24 @@ BasePrintLibVSPrint (
         Format += BytesPerFormatCharacter;\r
         FormatCharacter = (*Format | (*(Format + 1) << 8)) & FormatMask;\r
         switch (FormatCharacter) {\r
         Format += BytesPerFormatCharacter;\r
         FormatCharacter = (*Format | (*(Format + 1) << 8)) & FormatMask;\r
         switch (FormatCharacter) {\r

-        case '.': \r
-          Flags |= PRECISION; \r
+        case '.':\r
+          Flags |= PRECISION;\r

           break;\r
           break;\r

-        case '-': \r
-          Flags |= LEFT_JUSTIFY; \r
+        case '-':\r
+          Flags |= LEFT_JUSTIFY;\r

           break;\r
           break;\r

-        case '+': \r
-          Flags |= PREFIX_SIGN;  \r
+        case '+':\r
+          Flags |= PREFIX_SIGN;\r

           break;\r
           break;\r

-        case ' ': \r
-          Flags |= PREFIX_BLANK; \r
+        case ' ':\r
+          Flags |= PREFIX_BLANK;\r

           break;\r
           break;\r

-        case ',': \r
-          Flags |= COMMA_TYPE; \r
+        case ',':\r
+          Flags |= COMMA_TYPE;\r

           break;\r
         case 'L':\r
           break;\r
         case 'L':\r

-        case 'l': \r
-          Flags |= LONG_TYPE;    \r
+        case 'l':\r
+          Flags |= LONG_TYPE;\r

           break;\r
         case '*':\r
           if ((Flags & PRECISION) == 0) {\r
           break;\r
         case '*':\r
           if ((Flags & PRECISION) == 0) {\r


@@ -229,7 +231,7 @@ BasePrintLibVSPrint (
           Done = TRUE;\r
           break;\r
         }\r
           Done = TRUE;\r
           break;\r
         }\r

-      } \r
+      }\r

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


@@ -338,7 +340,7 @@ BasePrintLibVSPrint (
         } else {\r
           BasePrintLibSPrint (\r
             ValueBuffer,\r
         } else {\r
           BasePrintLibSPrint (\r
             ValueBuffer,\r

-            0, \r
+            0,\r

             0,\r
             "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",\r
             TmpGuid->Data1,\r
             0,\r
             "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",\r
             TmpGuid->Data1,\r


@@ -358,7 +360,7 @@ BasePrintLibVSPrint (
         break;\r
 \r
       case 't':\r
         break;\r
 \r
       case 't':\r

-        TmpTime = VA_ARG (Marker, TIME *); \r
+        TmpTime = VA_ARG (Marker, TIME *);\r

         if (TmpTime == NULL) {\r
           ArgumentString = "<null time>";\r
         } else {\r
         if (TmpTime == NULL) {\r
           ArgumentString = "<null time>";\r
         } else {\r


@@ -519,7 +521,7 @@ BasePrintLibVSPrint (
   // Null terminate the Unicode or ASCII string\r
   //\r
   Buffer = BasePrintLibFillBuffer (Buffer, 1, 0, BytesPerOutputCharacter);\r
   // Null terminate the Unicode or ASCII string\r
   //\r
   Buffer = BasePrintLibFillBuffer (Buffer, 1, 0, BytesPerOutputCharacter);\r

-   \r
+\r

   return ((Buffer - OriginalBuffer) / BytesPerOutputCharacter);\r
 }\r
 \r
   return ((Buffer - OriginalBuffer) / BytesPerOutputCharacter);\r
 }\r
 \r

diff --git a/Tools/Source/TianoTools/String/PrintLibInternal.c b/Tools/Source/TianoTools/String/PrintLibInternal.c
index 60e8bba0df15c34a98cd0cce566a10f2a875146c..63d0c7196f0f2602d6a9b2ed8ec516c86e69ef8c 100644 (file)
--- a/Tools/Source/TianoTools/String/PrintLibInternal.c
+++ b/Tools/Source/TianoTools/String/PrintLibInternal.c
@@ -1,22 +1,24 @@
-/** @file\r
-  Print Library worker functions.\r
-\r
+/*++\r

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

-This software and associated documentation (if any) is furnished\r
-under a license and may only be used or copied in accordance\r
-with the terms of the license. Except as permitted by such\r
-license, no part of this software or documentation may be\r
-reproduced, stored in a retrieval system, or transmitted in any\r
-form or by any means without the express written consent of\r
-Intel Corporation.\r
+This program and the accompanying materials are licensed and made available\r
+under the terms and conditions of the BSD License which accompanies this\r
+distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 \r

-  Module Name:  PrintLibInternal.c\r

 \r
 \r

-**/\r
+Module Name:\r
+\r
+  PrintLibInternal.c\r
+\r
+Abstract:\r
+\r
+  Print Library worker functions.\r
+\r
+--*/\r

 \r
 #include <Common/UefiBaseTypes.h>\r
 #include <Library/PrintLib.h>\r
 \r
 #include <Common/UefiBaseTypes.h>\r
 #include <Library/PrintLib.h>\r


@@ -48,11 +50,11 @@ BasePrintLibFillBuffer (
   Print worker function that prints a Value as a decimal number in Buffer.\r
 \r
   @param  Buffer Location to place the Unicode or ASCII string of Value.\r
   Print worker function that prints a Value as a decimal number in Buffer.\r
 \r
   @param  Buffer Location to place the Unicode or ASCII string of Value.\r

-  \r
+\r

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

-  \r
+\r

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

-  \r
+\r

   @param  Precision Minimum number of digits to return in the ASCII string\r
 \r
   @return Number of characters printed.\r
   @param  Precision Minimum number of digits to return in the ASCII string\r
 \r
   @return Number of characters printed.\r

diff --git a/Tools/Source/TianoTools/String/PrintLibInternal.h b/Tools/Source/TianoTools/String/PrintLibInternal.h
index 0a2cfb48d497c5eedd9e098d0b653afecbf86669..87f0955e05abe25826aa2a5d4e84c1991012f285 100644 (file)
--- a/Tools/Source/TianoTools/String/PrintLibInternal.h
+++ b/Tools/Source/TianoTools/String/PrintLibInternal.h
@@ -1,21 +1,24 @@
-/** @file\r
-  Print Library.\r
+/*++\r

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

-This software and associated documentation (if any) is furnished\r
-under a license and may only be used or copied in accordance\r
-with the terms of the license. Except as permitted by such\r
-license, no part of this software or documentation may be\r
-reproduced, stored in a retrieval system, or transmitted in any\r
-form or by any means without the express written consent of\r
-Intel Corporation.\r
+This program and the accompanying materials are licensed and made available\r
+under the terms and conditions of the BSD License which accompanies this\r
+distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Module Name:\r

 \r
 \r

-  Module Name:  PrintLibInternal.h\r
+  PrintLibInternal.h\r
+\r
+Abstract:\r
+\r
+  Print Library.\r

 \r
 \r

-**/\r
+--*/\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -83,8 +86,8 @@ BasePrintLibFillBuffer (
 UINTN\r
 EFIAPI\r
 BasePrintLibValueToString (\r
 UINTN\r
 EFIAPI\r
 BasePrintLibValueToString (\r

-  IN OUT CHAR8  *Buffer, \r
-  IN INT64      Value, \r
+  IN OUT CHAR8  *Buffer,\r
+  IN INT64      Value,\r

   IN UINTN      Radix\r
   );\r
 \r
   IN UINTN      Radix\r
   );\r
 \r

diff --git a/Tools/Source/TianoTools/String/String.c b/Tools/Source/TianoTools/String/String.c
index 9e02231f364f420efd99db96b3d25da43c06ec69..cdbf29964c693a2a331b0bd5e275feafccc9163b 100644 (file)
--- a/Tools/Source/TianoTools/String/String.c
+++ b/Tools/Source/TianoTools/String/String.c
@@ -1,21 +1,24 @@
-/** @file\r
-  Unicode string primatives.\r
+/*++\r

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

-This software and associated documentation (if any) is furnished\r
-under a license and may only be used or copied in accordance\r
-with the terms of the license. Except as permitted by such\r
-license, no part of this software or documentation may be\r
-reproduced, stored in a retrieval system, or transmitted in any\r
-form or by any means without the express written consent of\r
-Intel Corporation.\r
+This program and the accompanying materials are licensed and made available\r
+under the terms and conditions of the BSD License which accompanies this\r
+distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 \r

-  Module Name:  String.c\r

 \r
 \r

-**/\r
+Module Name:\r
+\r
+  String.c\r
+\r
+Abstract:\r
+\r
+  Unicode and ASCII string primatives.\r
+\r
+--*/\r

 \r
 #include <assert.h>\r
 \r
 \r
 #include <assert.h>\r
 \r

diff --git a/Tools/Source/TianoTools/Strip/Strip.c b/Tools/Source/TianoTools/Strip/Strip.c
index 35f141344546e52fe0bff1a6353a692cfae2db7a..c21c4413e2439654af3e426f9c9f80b64aed7d4a 100644 (file)
--- a/Tools/Source/TianoTools/Strip/Strip.c
+++ b/Tools/Source/TianoTools/Strip/Strip.c
@@ -1,13 +1,14 @@
 /*++\r
 \r
 Copyright (c)  2004-2006 Intel Corporation. All rights reserved\r
 /*++\r
 \r
 Copyright (c)  2004-2006 Intel Corporation. All rights reserved\r

-This software and associated documentation (if any) is furnished\r
-under a license and may only be used or copied in accordance\r
-with the terms of the license. Except as permitted by such\r
-license, no part of this software or documentation may be\r
-reproduced, stored in a retrieval system, or transmitted in any\r
-form or by any means without the express written consent of\r
-Intel Corporation.\r
+This program and the accompanying materials are licensed and made available\r
+under the terms and conditions of the BSD License which accompanies this\r
+distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r

 \r
 Module Name:\r
 \r
 \r
 Module Name:\r
 \r


@@ -42,7 +43,7 @@ Arguments:
 Returns:\r
 \r
   Zero     - Function completed successfully.\r
 Returns:\r
 \r
   Zero     - Function completed successfully.\r

-  Non-zero - Function exited with errors. \r
+  Non-zero - Function exited with errors.\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

diff --git a/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c b/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
index 6e454f2de2526e0a22b5d90cef247a584d542e6f..caf129b429c205f14b56c8386c0fa9c22e3f1432 100644 (file)
--- a/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
+++ b/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
@@ -1,18 +1,21 @@
 /*++\r
 \r
 Copyright (c)  2004-2006 Intel Corporation. All rights reserved\r
 /*++\r
 \r
 Copyright (c)  2004-2006 Intel Corporation. All rights reserved\r

-This software and associated documentation (if any) is furnished\r
-under a license and may only be used or copied in accordance\r
-with the terms of the license. Except as permitted by such\r
-license, no part of this software or documentation may be\r
-reproduced, stored in a retrieval system, or transmitted in any\r
-form or by any means without the express written consent of\r
-Intel Corporation.\r
+This program and the accompanying materials are licensed and made available\r
+under the terms and conditions of the BSD License which accompanies this\r
+distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r

 \r
 Module Name:\r
 \r
 Module Name:\r

+\r

   ZeroDebugData.c\r
 \r
 Abstract:\r
   ZeroDebugData.c\r
 \r
 Abstract:\r

+\r

   Zero the Debug Data Fields of Portable Executable (PE) format file.\r
 \r
 --*/\r
   Zero the Debug Data Fields of Portable Executable (PE) format file.\r
 \r
 --*/\r