Pushed as 723db52..c63f3dc

Mike

> -----Original Message-----
> From: Desimone, Nathaniel L
> Sent: Tuesday, July 30, 2019 2:34 PM
> To: Kinney, Michael D <michael.d.kin...@intel.com>;
> devel@edk2.groups.io; leif.lindh...@linaro.org
> Cc: Andrew Fish <af...@apple.com>; Laszlo Ersek
> <ler...@redhat.com>; Kubacki, Michael A
> <michael.a.kuba...@intel.com>; Sinha, Ankit
> <ankit.si...@intel.com>; Chiu, Chasel
> <chasel.c...@intel.com>; Yao, Jiewen
> <jiewen....@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaga...@intel.com>;
> gillis...@bivouac.eciton.net; Gillispie, Thad
> <thad.gillis...@intel.com>; b...@bivouac.eciton.net; Bu,
> Daocheng <daocheng...@intel.com>;
> o...@bivouac.eciton.net; Oram, Isaac W
> <isaac.w.o...@intel.com>; Sun, Zailiang
> <zailiang....@intel.com>; Qian, Yi <yi.q...@intel.com>
> Subject: RE: [edk2-devel] [edk2-non-osi] [PATCH 6/6]
> Cleanup maintainers, contributions, and licenses
> 
> Hi Mike,
> 
> No need to send a V2 patch series. Thank you for the
> help!
> 
> Nate
> 
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Monday, July 29, 2019 1:19 PM
> To: devel@edk2.groups.io; leif.lindh...@linaro.org;
> Desimone, Nathaniel L <nathaniel.l.desim...@intel.com>;
> Kinney, Michael D <michael.d.kin...@intel.com>
> Cc: Andrew Fish <af...@apple.com>; Laszlo Ersek
> <ler...@redhat.com>; Kubacki, Michael A
> <michael.a.kuba...@intel.com>; Sinha, Ankit
> <ankit.si...@intel.com>; Chiu, Chasel
> <chasel.c...@intel.com>; Yao, Jiewen
> <jiewen....@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaga...@intel.com>;
> gillis...@bivouac.eciton.net; Gillispie, Thad
> <thad.gillis...@intel.com>; b...@bivouac.eciton.net; Bu,
> Daocheng <daocheng...@intel.com>;
> o...@bivouac.eciton.net; Oram, Isaac W
> <isaac.w.o...@intel.com>; Sun, Zailiang
> <zailiang....@intel.com>; Qian, Yi <yi.q...@intel.com>
> Subject: RE: [edk2-devel] [edk2-non-osi] [PATCH 6/6]
> Cleanup maintainers, contributions, and licenses
> 
> Hi Nate,
> 
> Reviewed-by: Michael D Kinney
> <michael.d.kin...@intel.com>
> 
> Overall, the series looks good.  There are some minor
> issues in the commit messages:
> 
> * "reviewed-by" should be "Reviewed-by"
> * Names should first name then last name with no
> commas.
> * Subject should contain package/module followed by the
> brief
>   description.  Some patches do not have
> package/module.
> 
> I have fixed these in my local branch and have added
> the Reviewed-by tags from Leif and myself for patch #6.
> 
> Do you want me to send a V2 to the mailing list, or are
> you ok with these minor fixes to the commit messages?
> 
> Thanks,
> 
> Mike
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io
> > [mailto:devel@edk2.groups.io] On Behalf Of Leif
> Lindholm
> > Sent: Friday, July 26, 2019 10:32 AM
> > To: Desimone, Nathaniel L
> > <nathaniel.l.desim...@intel.com>
> > Cc: devel@edk2.groups.io; Andrew Fish
> > <af...@apple.com>; Laszlo Ersek <ler...@redhat.com>;
> Kinney, Michael D
> > <michael.d.kin...@intel.com>; Kubacki, Michael A
> > <michael.a.kuba...@intel.com>; Sinha, Ankit
> <ankit.si...@intel.com>;
> > Chiu, Chasel <chasel.c...@intel.com>; Yao, Jiewen
> > <jiewen....@intel.com>; Chaganty, Rangasai V
> > <rangasai.v.chaga...@intel.com>;
> gillis...@bivouac.eciton.net;
> > Gillispie, Thad <thad.gillis...@intel.com>;
> b...@bivouac.eciton.net; Bu,
> > Daocheng <daocheng...@intel.com>;
> o...@bivouac.eciton.net; Oram, Isaac
> > W <isaac.w.o...@intel.com>; Sun, Zailiang
> <zailiang....@intel.com>;
> > Qian, Yi <yi.q...@intel.com>
> > Subject: Re: [edk2-devel] [edk2-non-osi] [PATCH 6/6]
> Cleanup
> > maintainers, contributions, and licenses
> >
> > On Thu, Jul 25, 2019 at 10:35:48AM -0700, Nate
> DeSimone
> > wrote:
> > > - Merged Maintainers.txt from devel-MinPlatform
> > branch with
> > >   Maintainers.txt in master branch and updated to
> > match the maintainers
> > >   in the equivalent edk2-platforms Maintainers.txt
> > >
> > > - Removed the old Contributions.txt files
> > >
> > > - Updated the Kaby Lake microcode to the new Intel
> > microcode license
> > >   which Intel switched to in 2018
> >
> > Looks good to me.
> > Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org>
> >
> > > Cc: Andrew Fish <af...@apple.com>
> > > Cc: Laszlo Ersek <ler...@redhat.com>
> > > Cc: Leif Lindholm <leif.lindh...@linaro.org>
> > > Cc: Michael D Kinney <michael.d.kin...@intel.com>
> > > Cc: Michael Kubacki <michael.a.kuba...@intel.com>
> > > Cc: Ankit Sinha <ankit.si...@intel.com>
> > > Cc: Chasel Chiu <chasel.c...@intel.com>
> > > Cc: Jiewen Yao <jiewen....@intel.com>
> > > Cc: Sai Chaganty <rangasai.v.chaga...@intel.com>
> > > Cc: Gillispie, Thad <thad.gillis...@intel.com>
> > > Cc: Bu, Daocheng <daocheng...@intel.com>
> > > Cc: Oram, Isaac W <isaac.w.o...@intel.com>
> > > Cc: Zailiang Sun <zailiang....@intel.com>
> > > Cc: Yi Qian <yi.q...@intel.com>
> > > Signed-off-by: Nate DeSimone
> > <nathaniel.l.desim...@intel.com>
> > > ---
> > >  Contributions.txt                             |
> 163
> > -------------
> > >  Maintainers.txt                               |
> 20
> > ++
> > >  .../KabylakeSiliconBinPkg/Contributions.txt   |
> 218
> > ------------------
> > >  .../Intel/KabylakeSiliconBinPkg/License.txt   |
> 6
> > +-
> > >  .../Microcode/IntelMicrocodeLicense.txt       |
> 37
> > +++
> > >  5 files changed, 60 insertions(+), 384 deletions(-
> )
> > delete mode
> > > 100644 Contributions.txt  delete mode 100644
> > >
> Silicon/Intel/KabylakeSiliconBinPkg/Contributions.txt
> > >  create mode 100644
> > >
> >
> Silicon/Intel/KabylakeSiliconBinPkg/Microcode/IntelMicr
> > ocodeLicense.tx
> > > t
> > >
> > > diff --git a/Contributions.txt b/Contributions.txt
> > deleted file mode
> > > 100644 index 8cee4e2..0000000
> > > --- a/Contributions.txt
> > > +++ /dev/null
> > > @@ -1,163 +0,0 @@
> > > -======================
> > > -= Code Contributions =
> > > -======================
> > > -
> > > -To make a contribution to a TianoCore project,
> > follow these steps.
> > > -1. Create a change description in the format
> > specified below to
> > > -   use in the source control commit log.
> > > -2. Your commit message must include your "Signed-
> > off-by" signature,
> > > -   and "Contributed-under" message.
> > > -3. Your "Contributed-under" message explicitly
> > states that the
> > > -   contribution is made under the terms of the
> > specified
> > > -   contribution agreement.  Your "Contributed-
> under"
> > message
> > > -   must include the name of contribution agreement
> > and version.
> > > -   For example: Contributed-under: TianoCore
> > Contribution Agreement 1.0
> > > -   The "TianoCore Contribution Agreement" is
> > included below in
> > > -   this document.
> > > -4. Submit your code to the TianoCore project using
> > the process
> > > -   that the project documents on its web page.  If
> > the process is
> > > -   not documented, then submit the code on
> > development email list
> > > -   for the project.
> > > -5. Contributions must have an explicit license,
> and
> > the license must be
> > > -   compatible with the contribution agreement. The
> > license must be
> > > -   available as a License.txt file alongside, or
> > above in the directory
> > > -   tree of, the contributed files.
> > > -
> > > -========================================
> > > -= TianoCore Contribution Agreement 1.1 =
> > > -========================================
> > > -
> > > -INTEL CORPORATION ("INTEL") MAKES AVAILABLE
> > SOFTWARE, DOCUMENTATION
> > > ("DOCUMENTATION"), -INFORMATION AND/OR OTHER
> > MATERIALS FOR USE IN THE
> > > TIANOCORE OPEN SOURCE -PROJECT (COLLECTIVELY
> > "CONTENT"). USE OF THE
> > > CONTENT IS GOVERNED BY THE -TERMS AND CONDITIONS OF
> > THIS AGREEMENT
> > > BETWEEN YOU AND INTEL AND/OR THE -TERMS AND
> > CONDITIONS OF LICENSE
> > > AGREEMENTS OR NOTICES INDICATED OR -REFERENCED
> BELOW.
> > BY USING THE
> > > CONTENT, YOU AGREE THAT YOUR USE OF THE -CONTENT IS
> > GOVERNED BY THIS
> > > AGREEMENT AND/OR THE TERMS AND CONDITIONS -OF ANY
> > APPLICABLE LICENSE
> > > AGREEMENTS OR NOTICES INDICATED OR REFERENCED -
> BELOW.
> > IF YOU DO NOT
> > > AGREE TO THE TERMS AND CONDITIONS OF THIS -
> AGREEMENT
> > AND THE TERMS AND
> > > CONDITIONS OF ANY APPLICABLE LICENSE -AGREEMENTS OR
> > NOTICES INDICATED
> > > OR REFERENCED BELOW, THEN YOU MAY NOT -USE THE
> > CONTENT.
> > > -
> > > -Unless otherwise indicated, all Content (except
> > Documentation) made
> > > available on the TianoCore -site is provided to you
> > under the terms
> > > and conditions of the BSD -License ("BSD"). A copy
> of
> > the BSD License
> > > is available at -
> http://opensource.org/licenses/bsd-
> > license.php
> > > -or when applicable, in the associated License.txt
> > file.
> > > -
> > > -Unless otherwise indicated, all Documentation made
> > available on the
> > > -TianoCore site is provided to you under the terms
> > and conditions of
> > > the -FreeBSD Documentation License ("FreeBSD"). A
> > copy of the BSD
> > > License is -available at
> > > https://www.freebsd.org/copyright/freebsd-doc-
> > license.html or, -when applicable, in the associated
> License.txt file.
> > > -
> > > -Certain other content may be made available under
> > other licenses as
> > > -indicated in or with such Content(for example, in
> a
> > License.txt file).
> > > -
> > > -You accept and agree to the following terms and
> > conditions for Your
> > > -present and future Contributions submitted to
> > TianoCore site. Except
> > > -for the license granted to Intel hereunder, You
> > reserve all right,
> > > -title, and interest in and to Your Contributions.
> > > -
> > > -== SECTION 1: Definitions ==
> > > -* "You" or "Contributor" shall mean the copyright
> > owner or legal
> > > -  entity authorized by the copyright owner that is
> > making a
> > > -  Contribution hereunder. All other entities that
> > control, are
> > > -  controlled by, or are under common control with
> > that entity are
> > > -  considered to be a single Contributor. For the
> > purposes of this
> > > -  definition, "control" means (i) the power,
> direct
> > or indirect, to
> > > -  cause the direction or management of such
> entity,
> > whether by
> > > -  contract or otherwise, or (ii) ownership of
> fifty
> > percent (50%)
> > > -  or more of the outstanding shares, or (iii)
> > beneficial ownership
> > > -  of such entity.
> > > -* "Contribution" shall mean any original work of
> > authorship,
> > > -  including any modifications or additions to an
> > existing work,
> > > -  that is intentionally submitted by You to the
> > TinaoCore site for
> > > -  inclusion in, or documentation of, any of the
> > Content. For the
> > > -  purposes of this definition, "submitted" means
> any
> > form of
> > > -  electronic, verbal, or written communication
> sent
> > to the
> > > -  TianoCore site or its representatives, including
> > but not limited
> > > -  to communication on electronic mailing lists,
> > source code
> > > -  control systems, and issue tracking systems that
> > are managed by,
> > > -  or on behalf of, the TianoCore site for the
> > purpose of
> > > -  discussing and improving the Content, but
> > excluding
> > > -  communication that is conspicuously marked or
> > otherwise
> > > -  designated in writing by You as "Not a
> > Contribution."
> > > -
> > > -== SECTION 2: License for Contributions ==
> > > -* Contributor hereby agrees that redistribution
> and
> > use of the
> > > -  Contribution in source and binary forms, with or
> > without
> > > -  modification, are permitted provided that the
> > following
> > > -  conditions are met:
> > > -** Redistributions of source code must retain the
> > Contributor's
> > > -   copyright notice, this list of conditions and
> the
> > following
> > > -   disclaimer.
> > > -** Redistributions in binary form must reproduce
> the
> > Contributor's
> > > -   copyright notice, this list of conditions and
> the
> > following
> > > -   disclaimer in the documentation and/or other
> > materials provided
> > > -   with the distribution.
> > > -* Disclaimer. None of the names of Contributor,
> > Intel, or the names
> > > -  of their respective contributors may be used to
> > endorse or
> > > -  promote products derived from this software
> > without specific
> > > -  prior written permission.
> > > -* Contributor grants a license (with the right to
> > sublicense) under
> > > -  claims of Contributor's patents that Contributor
> > can license that
> > > -  are infringed by the Contribution (as delivered
> by
> > Contributor) to
> > > -  make, use, distribute, sell, offer for sale, and
> > import the
> > > -  Contribution and derivative works thereof solely
> > to the minimum
> > > -  extent necessary for licensee to exercise the
> > granted copyright
> > > -  license; this patent license applies solely to
> > those portions of
> > > -  the Contribution that are unmodified. No
> hardware
> > per se is
> > > -  licensed.
> > > -* EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3
> BELOW,
> > THE
> > > -  CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "AS
> > IS" AND ANY
> > > -  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
> NOT
> > LIMITED TO,
> > > -  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
> > FITNESS FOR A
> > > -  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
> > SHALL THE
> > > -  CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INDIRECT,
> > INCIDENTAL,
> > > -  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
> > (INCLUDING, BUT
> > > -  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> OR
> > SERVICES;
> > > -  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> > INTERRUPTION)
> > > -  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> > WHETHER IN
> > > -  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> > NEGLIGENCE OR
> > > -  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
> > THE
> > > -  CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY
> > OF SUCH
> > > -  DAMAGE.
> > > -
> > > -== SECTION 3: Representations ==
> > > -* You represent that You are legally entitled to
> > grant the above
> > > -  license. If your employer(s) has rights to
> > intellectual property
> > > -  that You create that includes Your
> Contributions,
> > You represent
> > > -  that You have received permission to make
> > Contributions on behalf
> > > -  of that employer, that Your employer has waived
> > such rights for
> > > -  Your Contributions.
> > > -* You represent that each of Your Contributions is
> > Your original
> > > -  creation (see Section 4 for submissions on
> behalf
> > of others).
> > > -  You represent that Your Contribution submissions
> > include complete
> > > -  details of any third-party license or other
> > restriction
> > > -  (including, but not limited to, related patents
> > and trademarks)
> > > -  of which You are personally aware and which are
> > associated with
> > > -  any part of Your Contributions.
> > > -
> > > -== SECTION 4: Third Party Contributions ==
> > > -* Should You wish to submit work that is not Your
> > original creation,
> > > -  You may submit it to TianoCore site separately
> > from any
> > > -  Contribution, identifying the complete details
> of
> > its source
> > > -  and of any license or other restriction
> > (including, but not
> > > -  limited to, related patents, trademarks, and
> > license agreements)
> > > -  of which You are personally aware, and
> > conspicuously marking the
> > > -  work as "Submitted on behalf of a third-party:
> > [named here]".
> > > -
> > > -== SECTION 5: Miscellaneous ==
> > > -* Applicable Laws. Any claims arising under or
> > relating to this
> > > -  Agreement shall be governed by the internal
> > substantive laws of
> > > -  the State of Delaware or federal courts located
> in
> > Delaware,
> > > -  without regard to principles of conflict of
> laws.
> > > -* Language. This Agreement is in the English
> > language only, which
> > > -  language shall be controlling in all respects,
> and
> > all versions
> > > -  of this Agreement in any other language shall be
> > for accommodation
> > > -  only and shall not be binding. All
> communications
> > and notices made
> > > -  or given pursuant to this Agreement, and all
> > documentation and
> > > -  support to be provided, unless otherwise noted,
> > shall be in the
> > > -  English language.
> > > diff --git a/Maintainers.txt b/Maintainers.txt
> index
> > 4b1e1b5..9fba131
> > > 100644
> > > --- a/Maintainers.txt
> > > +++ b/Maintainers.txt
> > > @@ -40,6 +40,26 @@ W:
> > >
> >
> https://github.com/tianocore/tianocore.github.io/wiki/S
> > ecurity
> > >
> > >  EDK II Packages:
> > >  ----------------
> > > +
> > > +Platform/Intel/ClevoOpenBoardBinPkg
> > > +M: Michael Kubacki <michael.a.kuba...@intel.com>
> > > +M: Ankit Sinha <ankit.si...@intel.com>
> > > +M: Nate DeSimone <nathaniel.l.desim...@intel.com>
> > > +
> > > +Silicon/Intel/KabylakeSiliconBinPkg
> > > +M: Chasel Chiu <chasel.c...@intel.com>
> > > +M: Michael A Kubacki <michael.a.kuba...@intel.com>
> > > +M: Sai Chaganty <rangasai.v.chaga...@intel.com>
> > > +
> > > +Silicon/Intel/PurleySiliconBinPkg
> > > +M: Gillispie, Thad <thad.gillis...@intel.com>
> > > +M: Bu, Daocheng <daocheng...@intel.com>
> > > +M: Oram, Isaac W <isaac.w.o...@intel.com>
> > > +
> > >  Silicon/Intel/QuarkSocBinPkg
> > >  M: Michael D Kinney <michael.d.kin...@intel.com>
> > >  M: Kelly Steele <kelly.ste...@intel.com>
> > > +
> > > +Silicon/Intel/Vlv2SocBinPkg
> > > +M: Zailiang Sun <zailiang....@intel.com>
> > > +M: Yi Qian <yi.q...@intel.com>
> > > diff --git
> >
> a/Silicon/Intel/KabylakeSiliconBinPkg/Contributions.txt
> > >
> >
> b/Silicon/Intel/KabylakeSiliconBinPkg/Contributions.txt
> > > deleted file mode 100644
> > > index f87cbd7..0000000
> > > ---
> >
> a/Silicon/Intel/KabylakeSiliconBinPkg/Contributions.txt
> > > +++ /dev/null
> > > @@ -1,218 +0,0 @@
> > > -
> > > -======================
> > > -= Code Contributions =
> > > -======================
> > > -
> > > -To make a contribution to a TianoCore project,
> > follow these steps.
> > > -1. Create a change description in the format
> > specified below to
> > > -   use in the source control commit log.
> > > -2. Your commit message must include your "Signed-
> > off-by" signature,
> > > -   and "Contributed-under" message.
> > > -3. Your "Contributed-under" message explicitly
> > states that the
> > > -   contribution is made under the terms of the
> > specified
> > > -   contribution agreement.  Your "Contributed-
> under"
> > message
> > > -   must include the name of contribution agreement
> > and version.
> > > -   For example: Contributed-under: TianoCore
> > Contribution Agreement 1.0
> > > -   The "TianoCore Contribution Agreement" is
> > included below in
> > > -   this document.
> > > -4. Submit your code to the TianoCore project using
> > the process
> > > -   that the project documents on its web page.  If
> > the process is
> > > -   not documented, then submit the code on
> > development email list
> > > -   for the project.
> > > -5. It is preferred that contributions are
> submitted
> > using the same
> > > -   copyright license as the base project. When
> that
> > is not possible,
> > > -   then contributions using the following licenses
> > can be accepted:
> > > -   * BSD (2-clause):
> > http://opensource.org/licenses/BSD-2-Clause
> > > -   * BSD (3-clause):
> > http://opensource.org/licenses/BSD-3-Clause
> > > -   * MIT: http://opensource.org/licenses/MIT
> > > -   * Python-2.0:
> > http://opensource.org/licenses/Python-2.0
> > > -   * Zlib: http://opensource.org/licenses/Zlib
> > > -
> > > -   Contributions of code put into the public
> domain
> > can also be
> > > -   accepted.
> > > -
> > > -   Contributions using other licenses might be
> > accepted, but further
> > > -   review will be required.
> > > -
> > > -
> > =====================================================
> > > -= Change Description / Commit Message / Patch
> Email
> > =
> > > -
> > =====================================================
> > > -
> > > -Your change description should use the standard
> > format for a -commit
> > > message, and must include your "Signed-off-by"
> > signature -and the
> > > "Contributed-under" message.
> > > -
> > > -== Sample Change Description / Commit Message =
> > > -
> > > -=== Start of sample patch email message ===
> > > -
> > > -From: Contributor Name <contribu...@example.com>
> > > -Subject: [PATCH] CodeModule: Brief-single-line-
> > summary
> > > -
> > > -Full-commit-message
> > > -
> > > -Contributed-under: TianoCore Contribution
> Agreement
> > 1.0
> > > -Signed-off-by: Contributor Name
> > <contribu...@example.com>
> > > ----
> > > -
> > > -An extra message for the patch email which will
> not
> > be considered
> > > part -of the commit message can be added here.
> > > -
> > > -Patch content inline or attached
> > > -
> > > -=== End of sample patch email message ===
> > > -
> > > -=== Notes for sample patch email ===
> > > -
> > > -* The first line of commit message is taken from
> the
> > email's subject
> > > -  line following [PATCH]. The remaining portion of
> > the commit message
> > > -  is the email's content until the '---' line.
> > > -* git format-patch is one way to create this
> format
> > > -
> > > -=== Definitions for sample patch email ===
> > > -
> > > -* "CodeModule" is a short idenfier for the
> affected
> > code.  For
> > > -  example MdePkg, or MdeModulePkg UsbBusDxe.
> > > -* "Brief-single-line-summary" is a short summary
> of
> > the change.
> > > -* The entire first line should be less than ~70
> > characters.
> > > -* "Full-commit-message" a verbose multiple line
> > comment describing
> > > -  the change.  Each line should be less than ~70
> > characters.
> > > -* "Contributed-under" explicitely states that the
> > contribution is
> > > -  made under the terms of the contribtion
> agreement.
> > This
> > > -  agreement is included below in this document.
> > > -* "Signed-off-by" is the contributor's signature
> > identifying them
> > > -  by their real/legal name and their email
> address.
> > > -
> > > -========================================
> > > -= TianoCore Contribution Agreement 1.0 =
> > > -========================================
> > > -
> > > -INTEL CORPORATION ("INTEL") MAKES AVAILABLE
> > SOFTWARE, DOCUMENTATION,
> > > -INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE
> > TIANOCORE OPEN
> > > SOURCE -PROJECT (COLLECTIVELY "CONTENT"). USE OF
> THE
> > CONTENT IS
> > > GOVERNED BY THE -TERMS AND CONDITIONS OF THIS
> > AGREEMENT BETWEEN YOU
> > > AND INTEL AND/OR THE -TERMS AND CONDITIONS OF
> LICENSE
> > AGREEMENTS OR
> > > NOTICES INDICATED OR -REFERENCED BELOW. BY USING
> THE
> > CONTENT, YOU
> > > AGREE THAT YOUR USE OF THE -CONTENT IS GOVERNED BY
> > THIS AGREEMENT
> > > AND/OR THE TERMS AND CONDITIONS -OF ANY APPLICABLE
> > LICENSE AGREEMENTS
> > > OR NOTICES INDICATED OR REFERENCED -BELOW. IF YOU
> DO
> > NOT AGREE TO THE
> > > TERMS AND CONDITIONS OF THIS -AGREEMENT AND THE
> TERMS
> > AND CONDITIONS
> > > OF ANY APPLICABLE LICENSE -AGREEMENTS OR NOTICES
> > INDICATED OR
> > > REFERENCED BELOW, THEN YOU MAY NOT -USE THE
> CONTENT.
> > > -
> > > -Unless otherwise indicated, all Content made
> > available on the
> > > TianoCore -site is provided to you under the terms
> > and conditions of
> > > the BSD -License ("BSD"). A copy of the BSD License
> > is available at
> > > -http://opensource.org/licenses/bsd-license.php
> > > -or when applicable, in the associated License.txt
> > file.
> > > -
> > > -Certain other content may be made available under
> > other licenses as
> > > -indicated in or with such Content. (For example,
> in
> > a License.txt
> > > file.)
> > > -
> > > -You accept and agree to the following terms and
> > conditions for Your
> > > -present and future Contributions submitted to
> > TianoCore site. Except
> > > -for the license granted to Intel hereunder, You
> > reserve all right,
> > > -title, and interest in and to Your Contributions.
> > > -
> > > -== SECTION 1: Definitions ==
> > > -* "You" or "Contributor" shall mean the copyright
> > owner or legal
> > > -  entity authorized by the copyright owner that is
> > making a
> > > -  Contribution hereunder. All other entities that
> > control, are
> > > -  controlled by, or are under common control with
> > that entity are
> > > -  considered to be a single Contributor. For the
> > purposes of this
> > > -  definition, "control" means (i) the power,
> direct
> > or indirect, to
> > > -  cause the direction or management of such
> entity,
> > whether by
> > > -  contract or otherwise, or (ii) ownership of
> fifty
> > percent (50%)
> > > -  or more of the outstanding shares, or (iii)
> > beneficial ownership
> > > -  of such entity.
> > > -* "Contribution" shall mean any original work of
> > authorship,
> > > -  including any modifications or additions to an
> > existing work,
> > > -  that is intentionally submitted by You to the
> > TinaoCore site for
> > > -  inclusion in, or documentation of, any of the
> > Content. For the
> > > -  purposes of this definition, "submitted" means
> any
> > form of
> > > -  electronic, verbal, or written communication
> sent
> > to the
> > > -  TianoCore site or its representatives, including
> > but not limited
> > > -  to communication on electronic mailing lists,
> > source code
> > > -  control systems, and issue tracking systems that
> > are managed by,
> > > -  or on behalf of, the TianoCore site for the
> > purpose of
> > > -  discussing and improving the Content, but
> > excluding
> > > -  communication that is conspicuously marked or
> > otherwise
> > > -  designated in writing by You as "Not a
> > Contribution."
> > > -
> > > -== SECTION 2: License for Contributions ==
> > > -* Contributor hereby agrees that redistribution
> and
> > use of the
> > > -  Contribution in source and binary forms, with or
> > without
> > > -  modification, are permitted provided that the
> > following
> > > -  conditions are met:
> > > -** Redistributions of source code must retain the
> > Contributor's
> > > -   copyright notice, this list of conditions and
> the
> > following
> > > -   disclaimer.
> > > -** Redistributions in binary form must reproduce
> the
> > Contributor's
> > > -   copyright notice, this list of conditions and
> the
> > following
> > > -   disclaimer in the documentation and/or other
> > materials provided
> > > -   with the distribution.
> > > -* Disclaimer. None of the names of Contributor,
> > Intel, or the names
> > > -  of their respective contributors may be used to
> > endorse or
> > > -  promote products derived from this software
> > without specific
> > > -  prior written permission.
> > > -* Contributor grants a license (with the right to
> > sublicense) under
> > > -  claims of Contributor's patents that Contributor
> > can license that
> > > -  are infringed by the Contribution (as delivered
> by
> > Contributor) to
> > > -  make, use, distribute, sell, offer for sale, and
> > import the
> > > -  Contribution and derivative works thereof solely
> > to the minimum
> > > -  extent necessary for licensee to exercise the
> > granted copyright
> > > -  license; this patent license applies solely to
> > those portions of
> > > -  the Contribution that are unmodified. No
> hardware
> > per se is
> > > -  licensed.
> > > -* EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3
> BELOW,
> > THE
> > > -  CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "AS
> > IS" AND ANY
> > > -  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
> NOT
> > LIMITED TO,
> > > -  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
> > FITNESS FOR A
> > > -  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
> > SHALL THE
> > > -  CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INDIRECT,
> > INCIDENTAL,
> > > -  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
> > (INCLUDING, BUT
> > > -  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> OR
> > SERVICES;
> > > -  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> > INTERRUPTION)
> > > -  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> > WHETHER IN
> > > -  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> > NEGLIGENCE OR
> > > -  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
> > THE
> > > -  CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY
> > OF SUCH
> > > -  DAMAGE.
> > > -
> > > -== SECTION 3: Representations ==
> > > -* You represent that You are legally entitled to
> > grant the above
> > > -  license. If your employer(s) has rights to
> > intellectual property
> > > -  that You create that includes Your
> Contributions,
> > You represent
> > > -  that You have received permission to make
> > Contributions on behalf
> > > -  of that employer, that Your employer has waived
> > such rights for
> > > -  Your Contributions.
> > > -* You represent that each of Your Contributions is
> > Your original
> > > -  creation (see Section 4 for submissions on
> behalf
> > of others).
> > > -  You represent that Your Contribution submissions
> > include complete
> > > -  details of any third-party license or other
> > restriction
> > > -  (including, but not limited to, related patents
> > and trademarks)
> > > -  of which You are personally aware and which are
> > associated with
> > > -  any part of Your Contributions.
> > > -
> > > -== SECTION 4: Third Party Contributions ==
> > > -* Should You wish to submit work that is not Your
> > original creation,
> > > -  You may submit it to TianoCore site separately
> > from any
> > > -  Contribution, identifying the complete details
> of
> > its source
> > > -  and of any license or other restriction
> > (including, but not
> > > -  limited to, related patents, trademarks, and
> > license agreements)
> > > -  of which You are personally aware, and
> > conspicuously marking the
> > > -  work as "Submitted on behalf of a third-party:
> > [named here]".
> > > -
> > > -== SECTION 5: Miscellaneous ==
> > > -* Applicable Laws. Any claims arising under or
> > relating to this
> > > -  Agreement shall be governed by the internal
> > substantive laws of
> > > -  the State of Delaware or federal courts located
> in
> > Delaware,
> > > -  without regard to principles of conflict of
> laws.
> > > -* Language. This Agreement is in the English
> > language only, which
> > > -  language shall be controlling in all respects,
> and
> > all versions
> > > -  of this Agreement in any other language shall be
> > for accommodation
> > > -  only and shall not be binding. All
> communications
> > and notices made
> > > -  or given pursuant to this Agreement, and all
> > documentation and
> > > -  support to be provided, unless otherwise noted,
> > shall be in the
> > > -  English language.
> > > -
> > > diff --git
> > a/Silicon/Intel/KabylakeSiliconBinPkg/License.txt
> > > b/Silicon/Intel/KabylakeSiliconBinPkg/License.txt
> > > index 3274186..5f9dd7a 100644
> > > ---
> a/Silicon/Intel/KabylakeSiliconBinPkg/License.txt
> > > +++
> b/Silicon/Intel/KabylakeSiliconBinPkg/License.txt
> > > @@ -1,4 +1,4 @@
> > > -Copyright (c) 2012, Intel Corporation. All rights
> > reserved.
> > > +Copyright (c) 2012 - 2019, Intel Corporation. All
> > rights reserved.
> > >
> > >  Redistribution and use in source and binary forms,
> > with or without
> > > modification, are permitted provided that the
> > following conditions @@
> > > -25,6 +25,6 @@ ANY WAY OUT OF THE USE OF THIS
> > SOFTWARE, EVEN IF
> > > ADVISED OF THE  POSSIBILITY OF SUCH DAMAGE.
> > >
> > >  Some files are subject to a license documented in
> > the
> > > -IntelProprietaryLicense.txt file. These files are
> in
> > the same
> > > -directory as IntelProprietaryLicense.txt, and they
> > do not have
> > > +IntelMicrocodeLicense.txt file. These files are in
> > the same directory
> > > +as IntelMicrocodeLicense.txt, and they do not have
> > >  a license specified within the file.
> > > diff --git
> > >
> >
> a/Silicon/Intel/KabylakeSiliconBinPkg/Microcode/IntelMi
> > crocodeLicense.
> > > txt
> > >
> >
> b/Silicon/Intel/KabylakeSiliconBinPkg/Microcode/IntelMi
> > crocodeLicense.
> > > txt
> > > new file mode 100644
> > > index 0000000..707d090
> > > --- /dev/null
> > > +++
> >
> b/Silicon/Intel/KabylakeSiliconBinPkg/Microcode/IntelMi
> > crocodeLice
> > > +++ nse.txt
> > > @@ -0,0 +1,37 @@
> > > +Copyright (c) 2018-2019 Intel Corporation.
> > > +All rights reserved.
> > > +
> > > +Redistribution.
> > > +
> > > +Redistribution and use in binary form, without
> > modification, are
> > > +permitted, provided that the following conditions
> > are met:
> > > +
> > > +1.  Redistributions must reproduce the above
> > copyright notice and the
> > > +    following disclaimer in the documentation
> and/or
> > other materials provided
> > > +    with the distribution.
> > > +
> > > +2.  Neither the name of Intel Corporation nor the
> > names of its suppliers may
> > > +    be used to endorse or promote products derived
> > from this software without
> > > +    specific prior written permission.
> > > +
> > > +3.  No reverse engineering, decompilation, or
> > disassembly of this software
> > > +    is permitted.
> > > +
> > > +
> > > +"Binary form" includes any format that is commonly
> > used for
> > > +electronic conveyance that is a reversible, bit-
> > exact translation of
> > > +binary representation to ASCII or ISO text, for
> > example "uuencode".
> > > +
> > > +DISCLAIMER.
> > > +
> > > +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
> > AND CONTRIBUTORS "AS IS"
> > > +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
> > BUT NOT LIMITED TO,
> > > +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
> > FITNESS FOR A
> > > +PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
> > SHALL THE COPYRIGHT
> > > +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
> > INDIRECT, INCIDENTAL,
> > > +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
> > (INCLUDING, BUT NOT
> > > +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> > SERVICES; LOSS OF USE,
> > > +DATA, OR PROFITS; OR BUSINESS
> > > +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
> > LIABILITY, WHETHER
> > > +IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> > NEGLIGENCE OR
> > > +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
> THIS
> > SOFTWARE, EVEN
> > > +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> > > --
> > > 2.17.1.windows.2
> > >
> >
> > 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44803): https://edk2.groups.io/g/devel/message/44803
Mute This Topic: https://groups.io/mt/32601187/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to