This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 104bbd688d34685814553186ddeee03436dcff95 Author: Marco Casaroli <[email protected]> AuthorDate: Tue Oct 27 20:30:11 2026 +0100 arch/arm, libs/libc: Restore the copyright notices of the SPDX change. The change to SPDX tags (344968b8c2b and 382c0302ce1) changed some copyright notices from their original text: - imxrt_edma.c, imxrt_edma.h, lpc54_clockconfig.c, lpc54_clockconfig.h, lpc54_ethernet.c and lpc54_lowputc.c: "All rights reserved" closed the NXP notice, but it was moved after the SPDX-FileContributor line, away from any notice. Put it back on the NXP notice. - lpc54_emc.c, lpc54_emc.h and lpc54_i2c_master.c: the original header had no "All rights reserved" for the NXP notices, but the change added one after the SPDX-FileContributor line. Remove it. - lib_bsearch.c: the original notice "1990, 1993 The Regents of the University of California. All rights reserved." became two notices. Make it one notice again. - lib_qsort.c: the original notices are "2007, 2009, 2011 Gregory Nutt. All rights reserved." and "1992, 1993 The Regents of the University of California. All rights reserved.", but the change wrote 1990 instead of 1992 and separated "All rights reserved". Restore them. Assisted-by: Claude Code:claude-opus-5-5 Signed-off-by: Marco Casaroli <[email protected]> --- arch/arm/src/imxrt/imxrt_edma.c | 3 +-- arch/arm/src/imxrt/imxrt_edma.h | 3 +-- arch/arm/src/lpc54xx/lpc54_clockconfig.c | 3 +-- arch/arm/src/lpc54xx/lpc54_clockconfig.h | 3 +-- arch/arm/src/lpc54xx/lpc54_emc.c | 1 - arch/arm/src/lpc54xx/lpc54_emc.h | 1 - arch/arm/src/lpc54xx/lpc54_ethernet.c | 3 +-- arch/arm/src/lpc54xx/lpc54_i2c_master.c | 1 - arch/arm/src/lpc54xx/lpc54_lowputc.c | 3 +-- libs/libc/stdlib/lib_bsearch.c | 4 +--- libs/libc/stdlib/lib_qsort.c | 6 ++---- 11 files changed, 9 insertions(+), 22 deletions(-) diff --git a/arch/arm/src/imxrt/imxrt_edma.c b/arch/arm/src/imxrt/imxrt_edma.c index 1f787509c0c..bb54ab7f615 100644 --- a/arch/arm/src/imxrt/imxrt_edma.c +++ b/arch/arm/src/imxrt/imxrt_edma.c @@ -3,10 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2018 Gregory Nutt. All rights reserved. - * SPDX-FileCopyrightText: 2016-2017 NXP + * SPDX-FileCopyrightText: 2016-2017 NXP. All rights reserved * SPDX-FileCopyrightText: 2015, Freescale Semiconductor, Inc. * SPDX-FileContributor: Gregory Nutt <[email protected]> - * All rights reserved * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/arch/arm/src/imxrt/imxrt_edma.h b/arch/arm/src/imxrt/imxrt_edma.h index a24c5429207..94b0c099788 100644 --- a/arch/arm/src/imxrt/imxrt_edma.h +++ b/arch/arm/src/imxrt/imxrt_edma.h @@ -3,10 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2018 Gregory Nutt. All rights reserved. - * SPDX-FileCopyrightText: 2016-2017 NXP + * SPDX-FileCopyrightText: 2016-2017 NXP. All rights reserved * SPDX-FileCopyrightText: 2015, Freescale Semiconductor, Inc. * SPDX-FileContributor: Gregory Nutt <[email protected]> - * All rights reserved * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/arch/arm/src/lpc54xx/lpc54_clockconfig.c b/arch/arm/src/lpc54xx/lpc54_clockconfig.c index 1976bca2ada..1941eb2327d 100644 --- a/arch/arm/src/lpc54xx/lpc54_clockconfig.c +++ b/arch/arm/src/lpc54xx/lpc54_clockconfig.c @@ -4,9 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2017-2019 Gregory Nutt. All rights reserved. * SPDX-FileCopyrightText: 2016 Freescale Semiconductor Inc. - * SPDX-FileCopyrightText: 2016 - 2017, NXP + * SPDX-FileCopyrightText: 2016 - 2017, NXP. All rights reserved. * SPDX-FileContributor: Gregory Nutt <[email protected]> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/arch/arm/src/lpc54xx/lpc54_clockconfig.h b/arch/arm/src/lpc54xx/lpc54_clockconfig.h index a48978dd442..ca55b4f5e0d 100644 --- a/arch/arm/src/lpc54xx/lpc54_clockconfig.h +++ b/arch/arm/src/lpc54xx/lpc54_clockconfig.h @@ -4,9 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2017 Gregory Nutt. All rights reserved. * SPDX-FileCopyrightText: 2016 Freescale Semiconductor Inc. - * SPDX-FileCopyrightText: 2016 - 2017, NXP + * SPDX-FileCopyrightText: 2016 - 2017, NXP. All rights reserved. * SPDX-FileContributor: Gregory Nutt <[email protected]> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/arch/arm/src/lpc54xx/lpc54_emc.c b/arch/arm/src/lpc54xx/lpc54_emc.c index 69917385203..2e4a633f170 100644 --- a/arch/arm/src/lpc54xx/lpc54_emc.c +++ b/arch/arm/src/lpc54xx/lpc54_emc.c @@ -6,7 +6,6 @@ * SPDX-FileCopyrightText: 2016 Freescale Semiconductor Inc. * SPDX-FileCopyrightText: 2016 - 2017, NXP * SPDX-FileContributor: Gregory Nutt <[email protected]> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/arch/arm/src/lpc54xx/lpc54_emc.h b/arch/arm/src/lpc54xx/lpc54_emc.h index c9725bbf9cb..565e1c3de9c 100644 --- a/arch/arm/src/lpc54xx/lpc54_emc.h +++ b/arch/arm/src/lpc54xx/lpc54_emc.h @@ -6,7 +6,6 @@ * SPDX-FileCopyrightText: 2016 Freescale Semiconductor Inc. * SPDX-FileCopyrightText: 2016 - 2017, NXP * SPDX-FileContributor: Gregory Nutt <[email protected]> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c index f07103ec2bd..661ed6a3f42 100644 --- a/arch/arm/src/lpc54xx/lpc54_ethernet.c +++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c @@ -4,9 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2017 Gregory Nutt. All rights reserved. * SPDX-FileCopyrightText: 2016 Freescale Semiconductor Inc. - * SPDX-FileCopyrightText: 2016 - 2017, NXP + * SPDX-FileCopyrightText: 2016 - 2017, NXP. All rights reserved. * SPDX-FileContributor: Gregory Nutt <[email protected]> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/arch/arm/src/lpc54xx/lpc54_i2c_master.c b/arch/arm/src/lpc54xx/lpc54_i2c_master.c index 64b15afdab7..8d2edba0c19 100644 --- a/arch/arm/src/lpc54xx/lpc54_i2c_master.c +++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.c @@ -6,7 +6,6 @@ * SPDX-FileCopyrightText: 2016 Freescale Semiconductor Inc. * SPDX-FileCopyrightText: 2016 - 2017, NXP * SPDX-FileContributor: Gregory Nutt <[email protected]> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/arch/arm/src/lpc54xx/lpc54_lowputc.c b/arch/arm/src/lpc54xx/lpc54_lowputc.c index 14fb4d004c4..448c16d55ee 100644 --- a/arch/arm/src/lpc54xx/lpc54_lowputc.c +++ b/arch/arm/src/lpc54xx/lpc54_lowputc.c @@ -4,9 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2017 Gregory Nutt. All rights reserved. * SPDX-FileCopyrightText: 2016 Freescale Semiconductor Inc. - * SPDX-FileCopyrightText: 2016 - 2017, NXP + * SPDX-FileCopyrightText: 2016 - 2017, NXP. All rights reserved. * SPDX-FileContributor: Gregory Nutt <[email protected]> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/libs/libc/stdlib/lib_bsearch.c b/libs/libc/stdlib/lib_bsearch.c index c449480ad91..6306afbf008 100644 --- a/libs/libc/stdlib/lib_bsearch.c +++ b/libs/libc/stdlib/lib_bsearch.c @@ -2,9 +2,7 @@ * libs/libc/stdlib/lib_bsearch.c * * SPDX-License-Identifier: BSD-3-Clause - * SPDX-FileCopyrightText: 1990 The Regents of the University of California. - * SPDX-FileCopyrightText: 1993 The Regents of the University of California. - * All rights reserved. + * SPDX-FileCopyrightText: 1990, 1993 The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/libs/libc/stdlib/lib_qsort.c b/libs/libc/stdlib/lib_qsort.c index 61742d17ef4..51ad0d806c9 100644 --- a/libs/libc/stdlib/lib_qsort.c +++ b/libs/libc/stdlib/lib_qsort.c @@ -2,11 +2,9 @@ * libs/libc/stdlib/lib_qsort.c * * SPDX-License-Identifier: BSD-3-Clause - * SPDX-FileCopyrightText: 2007, 2009, 2011 Gregory Nutt. - * SPDX-FileCopyrightText: 1993 The Regents of the University of California. - * SPDX-FileCopyrightText: 1990 The Regents of the University of California. + * SPDX-FileCopyrightText: 2007, 2009, 2011 Gregory Nutt. All rights reserved. + * SPDX-FileCopyrightText: 1992, 1993 The Regents of the University of California. All rights reserved. * SPDX-FileContributor: Gregory Nutt <[email protected]> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions
