Skip to content

Commit

Permalink
Add NOTICE file in place of AUTHORS (#3445) (#3446)
Browse files Browse the repository at this point in the history
  • Loading branch information
sonals authored May 22, 2020
1 parent 8b2acfb commit 54f14c8
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 25 deletions.
22 changes: 0 additions & 22 deletions AUTHORS.rst

This file was deleted.

58 changes: 58 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
===========================
OPEN SOURCE SOFTWARE NOTICE
===========================

XRT userspace code includes software developed by the following (Apache 2.0)
* Copyright (C) 2019 Samsung Semiconductor, Inc
* (C) Copyright 2019 OSR Open Systems Resources, Inc.
* Copyright (C) Michael Preston <[email protected]> Microsoft
* Copyright (C) Jeff Baxter <[email protected]> Microsoft

XRT xocl and xclmgmt Linux kernel drivers include software from Linux kernel (GPL 2.0)
* Copyright 2012 Kim Phillips, Freescale Semiconductor.
* Copyright (C) 2006 David Gibson, IBM Corporation.
* Copyright (C) 2006 Peter Korsgaard <[email protected]>
* Copyright (C) 2007 Secret Lab Technologies Ltd.
* Copyright (c) 2009-2010 Intel Corporation
* Copyright (C) 2012 David Gibson, IBM Corporation.
* Copyright (C) 2014 David Gibson <[email protected]>
* Copyright (c) 2016-2019 The Khronos Group Inc.
* Copyright (C) 2016 Free Electrons
* Copyright (C) 2016 NextThing Co.
* Copyright (C) 2018 embedded brains GmbH

XRT xocl and xclmgmt Linux kernel drivers include software developed by the following (GPL 2.0)
* Copyright (C) Jan Stephan <[email protected]>


XRT xclmgmt Linux kernel driver includes software developed by the following (dual Apache 2.0 OR GPL 2.0)
* Copyright (C) Jan Stephan <[email protected]>


XRT userspace includes software from Khronos Group Inc.
* Copyright (c) 2008-2019 The Khronos Group Inc.
* Copyright (c) 2008-2015 The Khronos Group Inc.
* Copyright (c) 2016-2019 The Khronos Group Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and/or associated documentation files (the
"Materials"), to deal in the Materials without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Materials, and to
permit persons to whom the Materials are furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Materials.

MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
https://www.khronos.org/registry/

THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
2 changes: 1 addition & 1 deletion src/CMake/changelog.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ install(FILES "${CMAKE_SOURCE_DIR}/../CHANGELOG.rst"
install(FILES "${CMAKE_SOURCE_DIR}/../CONTRIBUTING.rst"
DESTINATION "${XRT_INSTALL_DIR}/share/doc")

install(FILES "${CMAKE_SOURCE_DIR}/../AUTHORS.rst"
install(FILES "${CMAKE_SOURCE_DIR}/../NOTICE"
DESTINATION "${XRT_INSTALL_DIR}/share/doc")
4 changes: 2 additions & 2 deletions src/include/1_2/CL/cl_ext_xilinx.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
******************************************************************************/

/*
* Copyright (C) 2018, Xilinx Inc - All rights reserved
* Copyright (C) 2018-2020, Xilinx Inc - All rights reserved
*/

#ifndef __CL_EXT_XILINX_H
Expand Down Expand Up @@ -516,7 +516,7 @@ xclGetComputeUnitInfo(cl_kernel kernel,
*
* @CL_DEVICE_HANDLE
* @type: void*
* Return: The underlying device handle for use with low
* Return: The underlying device handle for use with low
* level XRT APIs (xrt.h)
*/
#define CL_DEVICE_PCIE_BDF 0x1120 // BUS/DEVICE/FUNCTION
Expand Down

0 comments on commit 54f14c8

Please sign in to comment.