You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/09/02 13:56:19 UTC
[incubator-nuttx] 06/11: LICENSE: revert to the original license
from Atmel Corporation
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 110632293c2121a762a34706b87a7793b26570d0
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Thu Sep 2 10:28:22 2021 +0200
LICENSE: revert to the original license from Atmel Corporation
revert to the original license from Atmel Corporation and add the files to
the LICENSE file
Signed-off-by: Alin Jerpelea <al...@sony.com>
---
LICENSE | 46 +++++++++++++++++++++++++++++++++++++++++
drivers/mtd/hamming.c | 7 -------
drivers/mtd/mtd_modeltab.c | 7 -------
drivers/mtd/mtd_nand.c | 7 -------
drivers/mtd/mtd_nandecc.c | 7 -------
drivers/mtd/mtd_nandmodel.c | 7 -------
drivers/mtd/mtd_nandscheme.c | 7 -------
drivers/mtd/mtd_onfi.c | 12 -----------
include/nuttx/mtd/hamming.h | 7 -------
include/nuttx/mtd/nand.h | 7 -------
include/nuttx/mtd/nand_config.h | 7 -------
include/nuttx/mtd/nand_ecc.h | 7 -------
include/nuttx/mtd/nand_model.h | 12 -----------
include/nuttx/mtd/nand_raw.h | 7 -------
include/nuttx/mtd/nand_scheme.h | 7 -------
include/nuttx/mtd/onfi.h | 12 -----------
16 files changed, 46 insertions(+), 120 deletions(-)
diff --git a/LICENSE b/LICENSE
index 3158093..3103313 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2253,6 +2253,52 @@ fs/spiffs
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+drivers/mtd/hamming.c
+drivers/mtd/mtd_modeltab.c
+drivers/mtd/mtd_nand.c
+drivers/mtd/mtd_nandecc.c
+drivers/mtd/mtd_nandmodel.c
+drivers/mtd/mtd_nandscheme.c
+drivers/mtd/mtd_onfi.c
+include/nuttx/mtd/hamming.h
+include/nuttx/mtd/nand.h
+include/nuttx/mtd/nand_config.h
+include/nuttx/mtd/nand_ecc.h
+include/nuttx/mtd/nand_model.h
+include/nuttx/mtd/nand_raw.h
+include/nuttx/mtd/nand_scheme.h
+include/nuttx/mtd/onfi.h
+========================
+
+ Copyright (c) 2011, Atmel Corporation
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ 3. Neither the names NuttX nor Atmel nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ 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.
+
libs/libc/machine/arm/armv8-m
=============================
Copyright (c) 2011, 2012 ARM Ltd. All rights reserved.
diff --git a/drivers/mtd/hamming.c b/drivers/mtd/hamming.c
index b4268ee..7146523 100644
--- a/drivers/mtd/hamming.c
+++ b/drivers/mtd/hamming.c
@@ -1,13 +1,6 @@
/****************************************************************************
* drivers/mtd/hamming.c
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was taken directly from Atmel sample code with only
- * modifications for better integration with NuttX. The Atmel sample
- * code has a BSD compatible license that requires this copyright notice:
- *
* Copyright (c) 2011, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/drivers/mtd/mtd_modeltab.c b/drivers/mtd/mtd_modeltab.c
index 9ee73a1..1ae7d0d 100644
--- a/drivers/mtd/mtd_modeltab.c
+++ b/drivers/mtd/mtd_modeltab.c
@@ -1,13 +1,6 @@
/****************************************************************************
* drivers/mtd/mtd_modeltab.c
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was based on Atmel sample code with modifications for
- * better integration with NuttX. The Atmel sample code has a BSD
- * compatible license that requires this copyright notice:
- *
* Copyright (c) 2012, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/drivers/mtd/mtd_nand.c b/drivers/mtd/mtd_nand.c
index 1a8fc9d..ebff0fc 100644
--- a/drivers/mtd/mtd_nand.c
+++ b/drivers/mtd/mtd_nand.c
@@ -1,13 +1,6 @@
/****************************************************************************
* drivers/mtd/mtd_nand.c
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was based largely on Atmel sample code with modifications for
- * better integration with NuttX. The Atmel sample code has a BSD
- * compatible license that requires this copyright notice:
- *
* Copyright (c) 2011, 2012, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/drivers/mtd/mtd_nandecc.c b/drivers/mtd/mtd_nandecc.c
index 3001a6b..987616f 100644
--- a/drivers/mtd/mtd_nandecc.c
+++ b/drivers/mtd/mtd_nandecc.c
@@ -1,13 +1,6 @@
/****************************************************************************
* drivers/mtd/mtd_nandecc.c
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was based largely on Atmel sample code with modifications for
- * better integration with NuttX. The Atmel sample code has a BSD
- * compatible license that requires this copyright notice:
- *
* Copyright (c) 2011, 2012, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/drivers/mtd/mtd_nandmodel.c b/drivers/mtd/mtd_nandmodel.c
index 5565662..304e603 100644
--- a/drivers/mtd/mtd_nandmodel.c
+++ b/drivers/mtd/mtd_nandmodel.c
@@ -1,13 +1,6 @@
/****************************************************************************
* drivers/mtd/mtd_nandmodel.c
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was based largely on Atmel sample code with modifications for
- * better integration with NuttX. The Atmel sample code has a BSD
- * compatible license that requires this copyright notice:
- *
* Copyright (c) 2011, 2012, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/drivers/mtd/mtd_nandscheme.c b/drivers/mtd/mtd_nandscheme.c
index 1f3b42c..34e0586 100644
--- a/drivers/mtd/mtd_nandscheme.c
+++ b/drivers/mtd/mtd_nandscheme.c
@@ -1,13 +1,6 @@
/****************************************************************************
* drivers/mtd/mtd_nandscheme.c
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was based largely on Atmel sample code with modifications for
- * better integration with NuttX. The Atmel sample code has a BSD
- * compatible license that requires this copyright notice:
- *
* Copyright (c) 2012, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/drivers/mtd/mtd_onfi.c b/drivers/mtd/mtd_onfi.c
index cd36d58..159eee1 100644
--- a/drivers/mtd/mtd_onfi.c
+++ b/drivers/mtd/mtd_onfi.c
@@ -1,18 +1,6 @@
/****************************************************************************
* drivers/mtd/mtd_onfi.c
*
- * ONFI Support. The Open NAND Flash Interface (ONFI) is an industry
- * Workgroup made up of more than 100 companies that build, design-in, or
- * enable NAND Flash memory. This file provides definitions for standardized
- * ONFI NAND interfaces.
- *
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This ONFI logic was based largely on Atmel sample code with modifications
- * for better integration with NuttX. The Atmel sample code has a BSD
- * compatible license that requires this copyright notice:
- *
* Copyright (c) 2010, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/nuttx/mtd/hamming.h b/include/nuttx/mtd/hamming.h
index bb0e93e..274a5d7 100644
--- a/include/nuttx/mtd/hamming.h
+++ b/include/nuttx/mtd/hamming.h
@@ -1,13 +1,6 @@
/****************************************************************************
* include/nuttx/mtd/hamming.h
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was taken directly from Atmel sample code with only
- * modifications for better integration with NuttX. The Atmel sample
- * code has a BSD compatible license that requires this copyright notice:
- *
* Copyright (c) 2011, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/nuttx/mtd/nand.h b/include/nuttx/mtd/nand.h
index 37c5ad6..1792993 100644
--- a/include/nuttx/mtd/nand.h
+++ b/include/nuttx/mtd/nand.h
@@ -1,13 +1,6 @@
/****************************************************************************
* include/nuttx/mtd/nand.h
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was based largely on Atmel sample code with modifications for
- * better integration with NuttX. The Atmel sample code has a BSD
- * compatible license that requires this copyright notice:
- *
* Copyright (c) 2012, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/nuttx/mtd/nand_config.h b/include/nuttx/mtd/nand_config.h
index 92e353c..dec3196 100644
--- a/include/nuttx/mtd/nand_config.h
+++ b/include/nuttx/mtd/nand_config.h
@@ -1,13 +1,6 @@
/****************************************************************************
* include/nuttx/mtd/nand_config.h
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was based largely on Atmel sample code with modifications for
- * better integration with NuttX. The Atmel sample code has a BSD
- * compatible license that requires this copyright notice:
- *
* Copyright (c) 2012, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/nuttx/mtd/nand_ecc.h b/include/nuttx/mtd/nand_ecc.h
index bd86f55..8247a25 100644
--- a/include/nuttx/mtd/nand_ecc.h
+++ b/include/nuttx/mtd/nand_ecc.h
@@ -1,13 +1,6 @@
/****************************************************************************
* include/nuttx/mtd/nand_ecc.h
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was based largely on Atmel sample code with modifications for
- * better integration with NuttX. The Atmel sample code has a BSD
- * compatible license that requires this copyright notice:
- *
* Copyright (c) 2012, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/nuttx/mtd/nand_model.h b/include/nuttx/mtd/nand_model.h
index 717ff7c..b838f4e 100644
--- a/include/nuttx/mtd/nand_model.h
+++ b/include/nuttx/mtd/nand_model.h
@@ -1,18 +1,6 @@
/****************************************************************************
* include/nuttx/mtd/nand_model.h
*
- * ONFI Support. The Open NAND Flash Interface (ONFI) is an industry
- * Workgroup made up of more than 100 companies that build, design-in, or
- * enable NAND Flash memory. This file provides definitions for standardized
- * ONFI NAND interfaces.
- *
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was based largely on Atmel sample code for the SAMA5D3x with
- * modifications for better integration with NuttX. The Atmel sample code
- * has a BSD compatible license that requires this copyright notice:
- *
* Copyright (c) 2012, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/nuttx/mtd/nand_raw.h b/include/nuttx/mtd/nand_raw.h
index 57b999c..0120070 100644
--- a/include/nuttx/mtd/nand_raw.h
+++ b/include/nuttx/mtd/nand_raw.h
@@ -1,13 +1,6 @@
/****************************************************************************
* include/nuttx/mtd/nand_raw.h
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was based largely on Atmel sample code with modifications for
- * better integration with NuttX. The Atmel sample code has a BSD
- * compatible license that requires this copyright notice:
- *
* Copyright (c) 2012, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/nuttx/mtd/nand_scheme.h b/include/nuttx/mtd/nand_scheme.h
index 2ab237d..9963304 100644
--- a/include/nuttx/mtd/nand_scheme.h
+++ b/include/nuttx/mtd/nand_scheme.h
@@ -1,13 +1,6 @@
/****************************************************************************
* include/nuttx/mtd/nand_scheme.h
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This logic was based largely on Atmel sample code with modifications for
- * better integration with NuttX. The Atmel sample code has a BSD
- * compatible license that requires this copyright notice:
- *
* Copyright (c) 2012, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/nuttx/mtd/onfi.h b/include/nuttx/mtd/onfi.h
index 4632927..6e579ba 100644
--- a/include/nuttx/mtd/onfi.h
+++ b/include/nuttx/mtd/onfi.h
@@ -1,18 +1,6 @@
/****************************************************************************
* include/nuttx/mtd/onfi.h
*
- * ONFI Support. The Open NAND Flash Interface (ONFI) is an industry
- * Workgroup made up of more than 100 companies that build, design-in, or
- * enable NAND Flash memory. This file provides definitions for standardized
- * ONFI NAND interfaces.
- *
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This ONFI logic was based largely on Atmel sample code for the SAMA5D3x
- * with modifications for better integration with NuttX. The Atmel sample
- * code has a BSD compatible license that requires this copyright notice:
- *
* Copyright (c) 2010, Atmel Corporation
*
* Redistribution and use in source and binary forms, with or without