merge with master

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644 (file)
index 46d1687..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Jinmin Jung <jinmin@samsung.com>
-DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/LICENSE.APLv2 b/LICENSE
similarity index 99%
rename from LICENSE.APLv2
rename to LICENSE
index 6b0b127..a06208b 100644 (file)
--- a/LICENSE.APLv2
+++ b/LICENSE
@@ -1,3 +1,4 @@
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/LICENSE.Broadcom b/LICENSE.Broadcom
deleted file mode 100644 (file)
index b39ee62..0000000
--- a/LICENSE.Broadcom
+++ /dev/null
@@ -1,66 +0,0 @@
-SOFTWARE LICENSE AGREEMENT\r
-\r
-The accompanying software in binary code form ("Software"), is licensed to you,\r
-or, if you are accepting on behalf of an entity, the entity and its affiliates\r
-exercising rights hereunder ("Licensee") subject to the terms of this software\r
-license agreement ("Agreement"), unless Licensee and Broadcom Corporation\r
-("Broadcom") execute a separate written software license agreement governing\r
-use of the Software. ANY USE, REPRODUCTION, OR DISTRIBUTION OF THE SOFTWARE\r
-CONSTITUTES LICENSEE'S ACCEPTANCE OF THIS AGREEMENT.\r
-\r
-1.     License. Subject to the terms and conditions of this Agreement,\r
-Broadcom hereby grants to Licensee a limited, non-exclusive, non-transferable,\r
-royalty-free license: (i) to use and integrate the Software with any other\r
-software; and (ii) to reproduce and distribute the Software complete,\r
-unmodified, and as provided by Broadcom, solely for use with Broadcom\r
-proprietary integrated circuit product(s) sold by Broadcom with which the\r
-Software was designed to be used, or their successors.\r
-\r
-2.     Restrictions. Licensee shall distribute Software with a copy of this\r
-Agreement. Licensee shall not remove, efface or obscure any copyright or\r
-trademark notices from the Software. Reproductions of the Broadcom copyright\r
-notice shall be included with each copy of the Software, except where such\r
-Software is embedded in a manner not readily accessible to the end user.\r
-Licensee shall not: (i) use, license, sell or otherwise distribute the Software\r
-except as provided in this Agreement; (ii) attempt to modify in any way,\r
-reverse engineer, decompile or disassemble any portion of the Software; or\r
-(iii) use the Software or other material in violation of any applicable law or\r
-regulation, including but not limited to any regulatory agency. This Agreement\r
-shall automatically terminate upon Licensee’s failure to comply with any of the\r
-terms of this Agreement. In such event, Licensee will destroy all copies of the\r
-Software and its component parts.\r
-\r
-3.     Ownership. The Software is licensed and not sold.  Title to and\r
-ownership of the Software, including all intellectual property rights thereto,\r
-and any portion thereof remain with Broadcom or its licensors. Licensee hereby\r
-covenants that it will not assert any claim that the Software created by or for\r
-Broadcom infringe any intellectual property right owned or controlled by\r
-Licensee.\r
-\r
-4.     Disclaimer. THE SOFTWARE IS OFFERED "AS IS," AND BROADCOM PROVIDES AND\r
-GRANTS AND LICENSEE RECEIVES NO SUPPORT AND NO WARRANTIES OF ANY KIND, EXPRESS\r
-OR IMPLIED, BY STATUTE, COMMUNICATION OR CONDUCT WITH LICENSEE, OR OTHERWISE.\r
-BROADCOM SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY,\r
-FITNESS FOR A SPECIFIC PURPOSE, OR NONINFRINGEMENT CONCERNING THE SOFTWARE OR\r
-ANY UPGRADES TO OR DOCUMENTATION FOR THE SOFTWARE. WITHOUT LIMITATION OF THE\r
-ABOVE, BROADCOM GRANTS NO WARRANTY THAT THE SOFTWARE IS ERROR-FREE OR WILL\r
-OPERATE WITHOUT INTERRUPTION, AND GRANTS NO WARRANTY REGARDING ITS USE OR THE\r
-RESULTS THEREFROM INCLUDING, WITHOUT LIMITATION, ITS CORRECTNESS, ACCURACY, OR\r
-RELIABILITY. TO THE MAXIMUM EXTENT PERMITTED BY LAW, IN NO EVENT SHALL BROADCOM\r
-OR ANY OF ITS LICENSORS HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,\r
-INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED AND ON ANY THEORY\r
-OF LIABILITY, WHETHER FOR BREACH OF CONTRACT, TORT (INCLUDING NEGLIGENCE) OR\r
-OTHERWISE, ARISING OUT OF THIS AGREEMENT OR USE, REPRODUCTION, OR DISTRIBUTION\r
-OF THE SOFTWARE, INCLUDING BUT NOT LIMITED TO LOSS OF DATA AND LOSS OF PROFITS,\r
-EVEN IF SUCH PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THESE\r
-LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY\r
-LIMITED REMEDY.\r
-\r
-5.     Export Laws.  LICENSEE UNDERSTANDS AND AGREES THAT THE SOFTWARE IS\r
-SUBJECT TO UNITED STATES AND OTHER APPLICABLE EXPORT-RELATED LAWS AND\r
-REGULATIONS AND THAT LICENSEE MAY NOT EXPORT, RE-EXPORT OR TRANSFER THE\r
-SOFTWARE OR ANY DIRECT PRODUCT OF THE SOFTWARE EXCEPT AS PERMITTED UNDER THOSE\r
-LAWS. WITHOUT LIMITING THE FOREGOING, EXPORT, RE-EXPORT, OR TRANSFER OF THE\r
-SOFTWARE TO CUBA, IRAN, NORTH KOREA, SUDAN, AND SYRIA IS PROHIBITED.\r
-\r
-\r

diff --git a/NOTICE b/NOTICE
deleted file mode 100644 (file)
index 411d0c9..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,10 +0,0 @@
-Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Apache License, Version 2.
-Please, see the LICENSE.APLv2 file for Apache License terms and conditions.
-
-The following files are copyrighted by Broadcom and licensed under
-a separate license. Please, see the LICENSE.Broadcom file for
-license terms and conditions.
-
-Copyright (c) 2012 Broadcom Co., Ltd. All rights reserved.
-- firmware/*.hcd

diff --git a/set-address/setbd.c b/set-address/setbd.c
index ffc1f9f..092da16 100644 (file)
--- a/set-address/setbd.c
+++ b/set-address/setbd.c
@@ -1,7 +1,11 @@
 /*
  * setbd.c
  *
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved
+ *
+ * Contact:  Hocheol Seo <hocheol.seo@samsung.com>
+ *           GirishAshok Joshi <girish.joshi@samsung.com>
+ *           DoHyun Pyun <dh79.pyun@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/tools/bcmtool_4330b1.c b/tools/bcmtool_4330b1.c
index 886650d..6350a06 100644 (file)
--- a/tools/bcmtool_4330b1.c
+++ b/tools/bcmtool_4330b1.c
@@ -1,23 +1,11 @@
-/*
- * Name: bcmtool_4330b1.c
- *
- * Description: Download a patchram files for the HCD format
- *
- * Copyright (c) 2012-2013, Broadcom Corp., All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *              http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+/*****************************************************************************
+**                                                                           
+**  Name:          bcmtool.c
+**
+**  Description:   Download a patchram files for the HCD format
+**
+**  Copyright (c) 2000-2009, Broadcom Corp., All Rights Reserved.
+******************************************************************************/
 
 #include <stdio.h>
 #include <errno.h>