coreboot-gerrit May 2020

coreboot-gerrit@coreboot.org

1 participants
2588 discussions

Change in coreboot[master]: src/include/gpio.h: Drop 'include <soc/gpio.h>'
by HAOUAS Elyes (Code Review) 11 May '20

11 May '20

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41255 ) Change subject: src/include/gpio.h: Drop 'include <soc/gpio.h>' ...................................................................... src/include/gpio.h: Drop 'include <soc/gpio.h>' include <soc/gpio.h> in 'src/include/gpio.h' does not make sense. Change-Id: I38deed0981032ff3aacc71e2b1afb8fac7dbf62a Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/include/gpio.h 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/41255/1 diff --git a/src/include/gpio.h b/src/include/gpio.h index 57360f9..f4e1161 100644 --- a/src/include/gpio.h +++ b/src/include/gpio.h @@ -3,7 +3,6 @@ #ifndef __SRC_INCLUDE_GPIO_H__ #define __SRC_INCLUDE_GPIO_H__ -#include <soc/gpio.h> #include <types.h> /* <soc/gpio.h> must typedef a gpio_t that fits in 32 bits. */ -- To view, visit https://review.coreboot.org/c/coreboot/+/41255 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I38deed0981032ff3aacc71e2b1afb8fac7dbf62a Gerrit-Change-Number: 41255 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

2 5

Change in coreboot[master]: util/nvramtool: Remove license boiler plate from DISCLAIMER file, too
by Patrick Georgi (Code Review) 11 May '20

11 May '20

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41220 ) Change subject: util/nvramtool: Remove license boiler plate from DISCLAIMER file, too ...................................................................... util/nvramtool: Remove license boiler plate from DISCLAIMER file, too Change-Id: I7ce0f08efaddb07a5d5f484d313068e5db3c7e2e Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M util/nvramtool/DISCLAIMER 1 file changed, 1 insertion(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/41220/1 diff --git a/util/nvramtool/DISCLAIMER b/util/nvramtool/DISCLAIMER index f451354..5498391 100644 --- a/util/nvramtool/DISCLAIMER +++ b/util/nvramtool/DISCLAIMER @@ -8,14 +8,7 @@ UCRL-CODE-2003-012 All rights reserved. -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License (as published by the -Free Software Foundation) version 2, dated June 1991. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -conditions of the GNU General Public License for more details. +SPDX-License-Identifier: GPL-2.0-only This work was produced at the University of California, Lawrence Livermore National Laboratory (UC LLNL) under contract no. W-7405-ENG-48 (Contract 48) -- To view, visit https://review.coreboot.org/c/coreboot/+/41220 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7ce0f08efaddb07a5d5f484d313068e5db3c7e2e Gerrit-Change-Number: 41220 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newchange

2 3

Change in coreboot[master]: util/qualcomm/scripts: use SPDX header
by Patrick Georgi (Code Review) 11 May '20

11 May '20

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41219 ) Change subject: util/qualcomm/scripts: use SPDX header ...................................................................... util/qualcomm/scripts: use SPDX header Change-Id: Ife2d84bac1973a10139db2a1489b7ea54360eee1 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M util/qualcomm/scripts/cmm/debug_cb_405.cmm M util/qualcomm/scripts/cmm/debug_cb_845.cmm M util/qualcomm/scripts/cmm/debug_cb_common.cmm M util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm M util/qualcomm/scripts/cmm/debug_chroot_common.cmm M util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm 6 files changed, 6 insertions(+), 66 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/41219/1 diff --git a/util/qualcomm/scripts/cmm/debug_cb_405.cmm b/util/qualcomm/scripts/cmm/debug_cb_405.cmm index 2022092..d4301e1 100644 --- a/util/qualcomm/scripts/cmm/debug_cb_405.cmm +++ b/util/qualcomm/scripts/cmm/debug_cb_405.cmm @@ -1,15 +1,5 @@ ;============================================================================ -;## -;## -;## This program is free software; you can redistribute it and/or modify -;## it under the terms of the GNU General Public License version 2 and -;## only version 2 as published by the Free Software Foundation. -;## -;## This program is distributed in the hope that it will be useful, -;## but WITHOUT ANY WARRANTY; without even the implied warranty of -;## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;## GNU General Public License for more details. -;## +;## SPDX-License-Identifier: GPL-2.0-only ;============================================================================ ; Name: ; debug_cb_405.cmm diff --git a/util/qualcomm/scripts/cmm/debug_cb_845.cmm b/util/qualcomm/scripts/cmm/debug_cb_845.cmm index 034a14b..696f1c0 100644 --- a/util/qualcomm/scripts/cmm/debug_cb_845.cmm +++ b/util/qualcomm/scripts/cmm/debug_cb_845.cmm @@ -1,15 +1,5 @@ ;============================================================================ -;## -;## -;## This program is free software; you can redistribute it and/or modify -;## it under the terms of the GNU General Public License version 2 and -;## only version 2 as published by the Free Software Foundation. -;## -;## This program is distributed in the hope that it will be useful, -;## but WITHOUT ANY WARRANTY; without even the implied warranty of -;## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;## GNU General Public License for more details. -;## +;## SPDX-License-Identifier: GPL-2.0-only ;============================================================================ ; Name: ; debug_cb_845.cmm diff --git a/util/qualcomm/scripts/cmm/debug_cb_common.cmm b/util/qualcomm/scripts/cmm/debug_cb_common.cmm index c43621d..cbcb004 100644 --- a/util/qualcomm/scripts/cmm/debug_cb_common.cmm +++ b/util/qualcomm/scripts/cmm/debug_cb_common.cmm @@ -1,15 +1,5 @@ ;============================================================================ -;## -;## -;## This program is free software; you can redistribute it and/or modify -;## it under the terms of the GNU General Public License version 2 and -;## only version 2 as published by the Free Software Foundation. -;## -;## This program is distributed in the hope that it will be useful, -;## but WITHOUT ANY WARRANTY; without even the implied warranty of -;## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;## GNU General Public License for more details. -;## +;## SPDX-License-Identifier: GPL-2.0-only ;============================================================================ ; Name: ; debug_cb_common.cmm diff --git a/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm b/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm index 5dc73c4..2cfba8d 100644 --- a/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm +++ b/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm @@ -1,15 +1,5 @@ ;============================================================================ -;## -;## -;## This program is free software; you can redistribute it and/or modify -;## it under the terms of the GNU General Public License version 2 and -;## only version 2 as published by the Free Software Foundation. -;## -;## This program is distributed in the hope that it will be useful, -;## but WITHOUT ANY WARRANTY; without even the implied warranty of -;## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;## GNU General Public License for more details. -;## +;## SPDX-License-Identifier: GPL-2.0-only ;============================================================================ ; Name: ; debug_cb_trogdor.cmm diff --git a/util/qualcomm/scripts/cmm/debug_chroot_common.cmm b/util/qualcomm/scripts/cmm/debug_chroot_common.cmm index 75d79cc..46efa55 100644 --- a/util/qualcomm/scripts/cmm/debug_chroot_common.cmm +++ b/util/qualcomm/scripts/cmm/debug_chroot_common.cmm @@ -1,15 +1,5 @@ ;============================================================================ -;## -;## -;## This program is free software; you can redistribute it and/or modify -;## it under the terms of the GNU General Public License version 2 and -;## only version 2 as published by the Free Software Foundation. -;## -;## This program is distributed in the hope that it will be useful, -;## but WITHOUT ANY WARRANTY; without even the implied warranty of -;## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;## GNU General Public License for more details. -;## +;## SPDX-License-Identifier: GPL-2.0-only ;============================================================================ ; Name: ; debug_chroot_common.cmm diff --git a/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm b/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm index 1f13320..8f69866 100644 --- a/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm +++ b/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm @@ -1,15 +1,5 @@ ;============================================================================ -;## -;## -;## This program is free software; you can redistribute it and/or modify -;## it under the terms of the GNU General Public License version 2 and -;## only version 2 as published by the Free Software Foundation. -;## -;## This program is distributed in the hope that it will be useful, -;## but WITHOUT ANY WARRANTY; without even the implied warranty of -;## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;## GNU General Public License for more details. -;## +;## SPDX-License-Identifier: GPL-2.0-only ;============================================================================ ; Name: ; debug_chroot_trogdor.cmm -- To view, visit https://review.coreboot.org/c/coreboot/+/41219 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ife2d84bac1973a10139db2a1489b7ea54360eee1 Gerrit-Change-Number: 41219 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newchange

2 3

Change in coreboot[master]: util/cbfstool: Add SPDX header to generated linux_trampoline code, too
by Patrick Georgi (Code Review) 11 May '20

11 May '20

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41218 ) Change subject: util/cbfstool: Add SPDX header to generated linux_trampoline code, too ...................................................................... util/cbfstool: Add SPDX header to generated linux_trampoline code, too Change-Id: Id84244bb0c54326ea27be8801246fdeff039fb63 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M util/cbfstool/Makefile M util/cbfstool/linux_trampoline.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/41218/1 diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index 5251b2d..ad8f9a8 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -43,6 +43,7 @@ $(CC) -m32 -o linux_trampoline linux_trampoline.S -ffreestanding -nostdlib -nostdinc -Wl,--defsym=_start=0 $(OBJCOPY) -Obinary -j .data linux_trampoline trampoline echo "/* This file is automatically generated. Do not manually change */" > trampoline.c + echo "/* SPDX-License-Identifier: GPL-2.0-only */" >> trampoline.c xxd -c 16 -i trampoline >> trampoline.c mv trampoline.c linux_trampoline.c rm linux_trampoline trampoline diff --git a/util/cbfstool/linux_trampoline.c b/util/cbfstool/linux_trampoline.c index 87f174c..17588cb 100644 --- a/util/cbfstool/linux_trampoline.c +++ b/util/cbfstool/linux_trampoline.c @@ -1,4 +1,5 @@ /* This file is automatically generated. Do not manually change */ +/* SPDX-License-Identifier: GPL-2.0-only */ unsigned char trampoline[] = { 0xfc, 0x31, 0xd2, 0xb9, 0x00, 0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x01, 0x00, 0x01, 0xcb, 0x8b, 0x01, 0x3d, 0x4c, 0x42, 0x49, 0x4f, 0x74, 0x07, 0x83, 0xc1, 0x10, 0x39, 0xcb, 0x75, 0xe9, 0x39, -- To view, visit https://review.coreboot.org/c/coreboot/+/41218 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id84244bb0c54326ea27be8801246fdeff039fb63 Gerrit-Change-Number: 41218 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newchange

3 4

Change in coreboot[master]: util/nvramtool: Use SPDX headers
by Patrick Georgi (Code Review) 11 May '20

11 May '20

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41208 ) Change subject: util/nvramtool: Use SPDX headers ...................................................................... util/nvramtool: Use SPDX headers Change-Id: I2858fdf74e782f425d56653491cdebe83c185d19 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M util/nvramtool/accessors/layout-bin.c M util/nvramtool/accessors/layout-common.c M util/nvramtool/accessors/layout-text.c M util/nvramtool/accessors/layout-text.h M util/nvramtool/cbfs.h M util/nvramtool/cli/nvramtool.c M util/nvramtool/cli/opts.c M util/nvramtool/cli/opts.h M util/nvramtool/cmos_lowlevel.c M util/nvramtool/cmos_lowlevel.h M util/nvramtool/cmos_ops.c M util/nvramtool/cmos_ops.h M util/nvramtool/common.c M util/nvramtool/common.h M util/nvramtool/hexdump.c M util/nvramtool/hexdump.h M util/nvramtool/input_file.c M util/nvramtool/input_file.h M util/nvramtool/layout.c M util/nvramtool/layout.h M util/nvramtool/lbtable.c M util/nvramtool/lbtable.h M util/nvramtool/reg_expr.c M util/nvramtool/reg_expr.h 24 files changed, 24 insertions(+), 428 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/41208/1 diff --git a/util/nvramtool/accessors/layout-bin.c b/util/nvramtool/accessors/layout-bin.c index 544e7e9..3ae1d6e 100644 --- a/util/nvramtool/accessors/layout-bin.c +++ b/util/nvramtool/accessors/layout-bin.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * lbtable.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #include <string.h> #ifndef __MINGW32__ diff --git a/util/nvramtool/accessors/layout-common.c b/util/nvramtool/accessors/layout-common.c index e41d281..a117207 100644 --- a/util/nvramtool/accessors/layout-common.c +++ b/util/nvramtool/accessors/layout-common.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * layout_common.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #include <ctype.h> diff --git a/util/nvramtool/accessors/layout-text.c b/util/nvramtool/accessors/layout-text.c index e7d3e7f..acbe7f8 100644 --- a/util/nvramtool/accessors/layout-text.c +++ b/util/nvramtool/accessors/layout-text.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * layout-text.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #include "common.h" #include "layout-text.h" diff --git a/util/nvramtool/accessors/layout-text.h b/util/nvramtool/accessors/layout-text.h index cb03a77..db8bf48 100644 --- a/util/nvramtool/accessors/layout-text.h +++ b/util/nvramtool/accessors/layout-text.h @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * layout_file.h - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef LAYOUT_FILE_H #define LAYOUT_FILE_H diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h index 1cb4c66..35b98cf 100644 --- a/util/nvramtool/cbfs.h +++ b/util/nvramtool/cbfs.h @@ -1,42 +1,4 @@ -/* - * This file is dual-licensed. You can choose between: - * - The GNU GPL, version 2, as published by the Free Software Foundation - * - The revised BSD license (without advertising clause) - * - * --------------------------------------------------------------------------- - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * --------------------------------------------------------------------------- - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. - * --------------------------------------------------------------------------- - */ +/* SPDX-License-Identifier: GPL-2.0-only or BSD-3-Clause */ #ifndef _CBFS_H_ #define _CBFS_H_ diff --git a/util/nvramtool/cli/nvramtool.c b/util/nvramtool/cli/nvramtool.c index 30e5ef5..046bd9b 100644 --- a/util/nvramtool/cli/nvramtool.c +++ b/util/nvramtool/cli/nvramtool.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * nvramtool.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #include <fcntl.h> #include <stdio.h> diff --git a/util/nvramtool/cli/opts.c b/util/nvramtool/cli/opts.c index 18549cf..38bdfa4 100644 --- a/util/nvramtool/cli/opts.c +++ b/util/nvramtool/cli/opts.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * opts.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #include "common.h" #include "opts.h" diff --git a/util/nvramtool/cli/opts.h b/util/nvramtool/cli/opts.h index 2d087cd..d9a2801 100644 --- a/util/nvramtool/cli/opts.h +++ b/util/nvramtool/cli/opts.h @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * opts.h - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef OPTS_H #define OPTS_H diff --git a/util/nvramtool/cmos_lowlevel.c b/util/nvramtool/cmos_lowlevel.c index 410e427..f37ea7a 100644 --- a/util/nvramtool/cmos_lowlevel.c +++ b/util/nvramtool/cmos_lowlevel.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * cmos_lowlevel.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #if defined(__FreeBSD__) #include <fcntl.h> diff --git a/util/nvramtool/cmos_lowlevel.h b/util/nvramtool/cmos_lowlevel.h index 9a7f670..3efdbd0 100644 --- a/util/nvramtool/cmos_lowlevel.h +++ b/util/nvramtool/cmos_lowlevel.h @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * cmos_lowlevel.h - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef NVRAMTOOL_CMOS_LOWLEVEL_H #define NVRAMTOOL_CMOS_LOWLEVEL_H diff --git a/util/nvramtool/cmos_ops.c b/util/nvramtool/cmos_ops.c index 6ba7505..0286309 100644 --- a/util/nvramtool/cmos_ops.c +++ b/util/nvramtool/cmos_ops.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * cmos_ops.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #include "common.h" #include "cmos_ops.h" diff --git a/util/nvramtool/cmos_ops.h b/util/nvramtool/cmos_ops.h index c07ed63..8c819df 100644 --- a/util/nvramtool/cmos_ops.h +++ b/util/nvramtool/cmos_ops.h @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * cmos_ops.h - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef CMOS_OPS_H #define CMOS_OPS_H diff --git a/util/nvramtool/common.c b/util/nvramtool/common.c index a1a2706..68d2618 100644 --- a/util/nvramtool/common.c +++ b/util/nvramtool/common.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * common.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #include "common.h" diff --git a/util/nvramtool/common.h b/util/nvramtool/common.h index 4910f91..e15138c 100644 --- a/util/nvramtool/common.h +++ b/util/nvramtool/common.h @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * common.h - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef COMMON_H #define COMMON_H diff --git a/util/nvramtool/hexdump.c b/util/nvramtool/hexdump.c index 29cbc34..a34f4ef 100644 --- a/util/nvramtool/hexdump.c +++ b/util/nvramtool/hexdump.c @@ -1,44 +1,8 @@ -/*****************************************************************************\ - * hexdump.c -\*****************************************************************************/ +/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0 */ #include "hexdump.h" #include <ctype.h> -/* hexdump.c - * - * 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 entire permission notice, including - * the following disclaimer of warranties. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions, and the entire permission notice, - * including the following disclaimer in the documentation and/or other - * materials provided with the distribution. - * 3. The name(s) of the author(s) may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * ALTERNATIVELY, this product may be distributed under the terms of the GNU - * General Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is necessary due - * to a potential bad interaction between the GPL and the restrictions - * contained in a BSD-style copyright.) - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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 AUTHOR(S) 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. - */ - static void addrprint(FILE * outfile, uint64_t address, int width); /*-------------------------------------------------------------------------- diff --git a/util/nvramtool/hexdump.h b/util/nvramtool/hexdump.h index 98dca51..4b03d85 100644 --- a/util/nvramtool/hexdump.h +++ b/util/nvramtool/hexdump.h @@ -1,44 +1,8 @@ -/*****************************************************************************\ - * hexdump.h -\*****************************************************************************/ +/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0 */ #ifndef _HEXDUMP_H #define _HEXDUMP_H -/* hexdump.h - * - * 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 entire permission notice, including - * the following disclaimer of warranties. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions, and the entire permission notice, - * including the following disclaimer in the documentation and/or other - * materials provided with the distribution. - * 3. The name(s) of the author(s) may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * ALTERNATIVELY, this product may be distributed under the terms of the GNU - * General Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is necessary due - * to a potential bad interaction between the GPL and the restrictions - * contained in a BSD-style copyright.) - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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 AUTHOR(S) 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. - */ - #include <stdint.h> #include <sys/types.h> #include <stdio.h> diff --git a/util/nvramtool/input_file.c b/util/nvramtool/input_file.c index a7f0abd..8d2c9f2 100644 --- a/util/nvramtool/input_file.c +++ b/util/nvramtool/input_file.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * input_file.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #include "common.h" #include "input_file.h" diff --git a/util/nvramtool/input_file.h b/util/nvramtool/input_file.h index 7da9905..b479e48 100644 --- a/util/nvramtool/input_file.h +++ b/util/nvramtool/input_file.h @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * input_file.h - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef INPUT_FILE_H #define INPUT_FILE_H diff --git a/util/nvramtool/layout.c b/util/nvramtool/layout.c index 2fb24e8..582f14c 100644 --- a/util/nvramtool/layout.c +++ b/util/nvramtool/layout.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * layout.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #include "common.h" #include "layout.h" diff --git a/util/nvramtool/layout.h b/util/nvramtool/layout.h index 798711a..02652e0 100644 --- a/util/nvramtool/layout.h +++ b/util/nvramtool/layout.h @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * layout.h - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef LAYOUT_H #define LAYOUT_H diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c index 61dbdfb..fd6c9ec 100644 --- a/util/nvramtool/lbtable.c +++ b/util/nvramtool/lbtable.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * lbtable.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #include <stdint.h> #include <inttypes.h> diff --git a/util/nvramtool/lbtable.h b/util/nvramtool/lbtable.h index 2af2819..829a339 100644 --- a/util/nvramtool/lbtable.h +++ b/util/nvramtool/lbtable.h @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * lbtable.h - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef LBTABLE_H #define LBTABLE_H diff --git a/util/nvramtool/reg_expr.c b/util/nvramtool/reg_expr.c index 3c164e2..a3b1aa8 100644 --- a/util/nvramtool/reg_expr.c +++ b/util/nvramtool/reg_expr.c @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * reg_expr.c - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #include <stdarg.h> #include "common.h" diff --git a/util/nvramtool/reg_expr.h b/util/nvramtool/reg_expr.h index c0dad76..29977dd 100644 --- a/util/nvramtool/reg_expr.h +++ b/util/nvramtool/reg_expr.h @@ -1,18 +1,4 @@ -/*****************************************************************************\ - * reg_expr.h - ***************************************************************************** - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. -\*****************************************************************************/ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef REG_EXPR_H #define REG_EXPR_H -- To view, visit https://review.coreboot.org/c/coreboot/+/41208 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2858fdf74e782f425d56653491cdebe83c185d19 Gerrit-Change-Number: 41208 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newchange

2 6

Change in coreboot[master]: soc/intel/quark: Revamp file headers
by Patrick Georgi (Code Review) 11 May '20

11 May '20

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41207 ) Change subject: soc/intel/quark: Revamp file headers ...................................................................... soc/intel/quark: Revamp file headers Remove license boiler plate in favor of SPDX headers. Where there's valuable additional information, fix up formatting. Change-Id: I801f27bd1a2b9defd5672a52c3a06eb1a12a9302 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M src/soc/intel/quark/include/soc/IntelQNCConfig.h M src/soc/intel/quark/include/soc/Ioh.h M src/soc/intel/quark/include/soc/QuarkNcSocId.h 3 files changed, 14 insertions(+), 42 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/41207/1 diff --git a/src/soc/intel/quark/include/soc/IntelQNCConfig.h b/src/soc/intel/quark/include/soc/IntelQNCConfig.h index 36fc33c..411f75a 100644 --- a/src/soc/intel/quark/include/soc/IntelQNCConfig.h +++ b/src/soc/intel/quark/include/soc/IntelQNCConfig.h @@ -1,15 +1,5 @@ -/** @file -Some configuration of QNC Package - - -This program and the accompanying materials are licensed and made available -under the terms and conditions of the BSD License. The full text of the license -may be found at http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* Some configuration of QNC Package */ #ifndef __INTEL_QNC_CONFIG_H__ #define __INTEL_QNC_CONFIG_H__ diff --git a/src/soc/intel/quark/include/soc/Ioh.h b/src/soc/intel/quark/include/soc/Ioh.h index 649bc7c..c3e3350 100644 --- a/src/soc/intel/quark/include/soc/Ioh.h +++ b/src/soc/intel/quark/include/soc/Ioh.h @@ -1,15 +1,5 @@ -/** @file - * Header file for QuarkSCSocId Ioh. - * - * This program and the accompanying materials are licensed and made available - * under the terms and conditions of the BSD License which accompanies this - * distribution. The full text of the license may be found at - * http://opensource.org/licenses/bsd-license.php - * - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - * - */ +/* SPDX-License-Identifier: BSD-2-Clause */ + #ifndef _IOH_H_ #define _IOH_H_ diff --git a/src/soc/intel/quark/include/soc/QuarkNcSocId.h b/src/soc/intel/quark/include/soc/QuarkNcSocId.h index cacc128..46e4758 100644 --- a/src/soc/intel/quark/include/soc/QuarkNcSocId.h +++ b/src/soc/intel/quark/include/soc/QuarkNcSocId.h @@ -1,21 +1,13 @@ -/** @file -QuarkNcSocId Register Definitions - - -This program and the accompanying materials are licensed and made available -under the terms and conditions of the BSD License. The full text of the license -may be found at http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Definitions beginning with "R_" are registers -Definitions beginning with "B_" are bits within registers -Definitions beginning with "V_" are meaningful values of bits within registers -Definitions beginning with "S_" are register sizes -Definitions beginning with "N_" are the bit position - -**/ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * QuarkNcSocId Register Definitions + * Definitions beginning with "R_" are registers + * Definitions beginning with "B_" are bits within registers + * Definitions beginning with "V_" are meaningful values of bits within registers + * Definitions beginning with "S_" are register sizes + * Definitions beginning with "N_" are the bit position + * + */ #ifndef _QUARK_NC_SOC_ID_H_ #define _QUARK_NC_SOC_ID_H_ -- To view, visit https://review.coreboot.org/c/coreboot/+/41207 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I801f27bd1a2b9defd5672a52c3a06eb1a12a9302 Gerrit-Change-Number: 41207 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newchange

3 4

Change in coreboot[master]: src/drivers: some more SPDX headers
by Patrick Georgi (Code Review) 11 May '20

11 May '20

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41205 ) Change subject: src/drivers: some more SPDX headers ...................................................................... src/drivers: some more SPDX headers Change-Id: Ia3de79c7d71049da00ed108829eac6cb49ff3ed6 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M src/drivers/crb/tpm.c M src/drivers/crb/tpm.h M src/drivers/intel/fsp1_1/temp_ram_exit.c M src/drivers/spi/tpm/tis.c M src/drivers/spi/tpm/tpm.c M src/drivers/spi/tpm/tpm.h M src/drivers/ti/tps65090/tps65090.c M src/drivers/ti/tps65090/tps65090.h M src/drivers/vpd/vpd_cbmem.c 9 files changed, 12 insertions(+), 106 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/41205/1 diff --git a/src/drivers/crb/tpm.c b/src/drivers/crb/tpm.c index 964ccf9..6436725 100644 --- a/src/drivers/crb/tpm.c +++ b/src/drivers/crb/tpm.c @@ -1,7 +1,5 @@ -/*. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * +/* SPDX-License-Identifier: BSD-3-Clause */ +/* * This is a driver for a CRB Interface. * * The general flow looks like this: diff --git a/src/drivers/crb/tpm.h b/src/drivers/crb/tpm.h index 9bbed19..449d02f 100644 --- a/src/drivers/crb/tpm.h +++ b/src/drivers/crb/tpm.h @@ -1,10 +1,5 @@ -/* - * Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * This is a driver for a Command Response Buffer Interface - */ +/* SPDX-License-Identifier: BSD-3-Clause */ +/* This is a driver for a Command Response Buffer Interface */ /* CRB driver */ /* address of locality 0 (CRB) */ diff --git a/src/drivers/intel/fsp1_1/temp_ram_exit.c b/src/drivers/intel/fsp1_1/temp_ram_exit.c index 28bc940..08324eb 100644 --- a/src/drivers/intel/fsp1_1/temp_ram_exit.c +++ b/src/drivers/intel/fsp1_1/temp_ram_exit.c @@ -1,9 +1,4 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include <console/console.h> #include <fsp/util.h> diff --git a/src/drivers/spi/tpm/tis.c b/src/drivers/spi/tpm/tis.c index 60dc705..6849ea7 100644 --- a/src/drivers/spi/tpm/tis.c +++ b/src/drivers/spi/tpm/tis.c @@ -1,8 +1,4 @@ -/* - * Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ #include <console/console.h> #include <security/tpm/tis.h> diff --git a/src/drivers/spi/tpm/tpm.c b/src/drivers/spi/tpm/tpm.c index c47aed3..24851d1 100644 --- a/src/drivers/spi/tpm/tpm.c +++ b/src/drivers/spi/tpm/tpm.c @@ -1,9 +1,5 @@ -/* - * Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * This is a driver for a SPI interfaced TPM2 device. +/* SPDX-License-Identifier: BSD-3-Clause */ +/* This is a driver for a SPI interfaced TPM2 device. * * It assumes that the required SPI interface has been initialized before the * driver is started. A 'sruct spi_slave' pointer passed at initialization is diff --git a/src/drivers/spi/tpm/tpm.h b/src/drivers/spi/tpm/tpm.h index 214d3bd..be98ed0 100644 --- a/src/drivers/spi/tpm/tpm.h +++ b/src/drivers/spi/tpm/tpm.h @@ -1,8 +1,4 @@ -/* - * Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef __COREBOOT_SRC_DRIVERS_SPI_TPM_TPM_H #define __COREBOOT_SRC_DRIVERS_SPI_TPM_TPM_H diff --git a/src/drivers/ti/tps65090/tps65090.c b/src/drivers/ti/tps65090/tps65090.c index 6eae6fb..4f9005b 100644 --- a/src/drivers/ti/tps65090/tps65090.c +++ b/src/drivers/ti/tps65090/tps65090.c @@ -1,37 +1,4 @@ -/* - * Copyright 2012, Google Inc. - * All rights reserved. - * - * Redistribution and use 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 above copyright - * notice, this list of conditions and the following disclaimer. - * * 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. - * * Neither the name of Google Inc. 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. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - */ +/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0-only */ #include <delay.h> #include <types.h> diff --git a/src/drivers/ti/tps65090/tps65090.h b/src/drivers/ti/tps65090/tps65090.h index a79158b..f1ca727 100644 --- a/src/drivers/ti/tps65090/tps65090.h +++ b/src/drivers/ti/tps65090/tps65090.h @@ -1,37 +1,4 @@ -/* - * Copyright 2012, Google Inc. - * All rights reserved. - * - * Redistribution and use 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 above copyright - * notice, this list of conditions and the following disclaimer. - * * 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. - * * Neither the name of Google Inc. 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. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - */ +/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0-only */ #ifndef __TPS65090_H_ #define __TPS65090_H_ diff --git a/src/drivers/vpd/vpd_cbmem.c b/src/drivers/vpd/vpd_cbmem.c index a0bb161..eadda52 100644 --- a/src/drivers/vpd/vpd_cbmem.c +++ b/src/drivers/vpd/vpd_cbmem.c @@ -1,8 +1,4 @@ -/* - * Copyright (c) 2014 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ #include <console/console.h> #include <cbmem.h> -- To view, visit https://review.coreboot.org/c/coreboot/+/41205 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia3de79c7d71049da00ed108829eac6cb49ff3ed6 Gerrit-Change-Number: 41205 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newchange

4 12

Change in coreboot[master]: util/lint: Allow use of the HPND license group
by Patrick Georgi (Code Review) 11 May '20

11 May '20

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41221 ) Change subject: util/lint: Allow use of the HPND license group ...................................................................... util/lint: Allow use of the HPND license group The Historical Permission Notice and Disclaimer (with and without permission to sell) is a BSD-style license family that OSI and SPDX consider deprecated - and yet, it's right here in our tree. Change-Id: I61624b6e54e9aba6e2f54822c1f68967c416ad3d Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M util/lint/lint-000-license-headers 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/41221/1 diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers index 08e52f3..12654e4 100755 --- a/util/lint/lint-000-license-headers +++ b/util/lint/lint-000-license-headers @@ -107,6 +107,8 @@ check_for_license 'SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note' check_for_license 'SPDX-License-Identifier: GPL-3.0-only' check_for_license 'SPDX-License-Identifier: GPL-3.0-or-later' +check_for_license 'SPDX-License-Identifier: HPND' +check_for_license 'SPDX-License-Identifier: HPND-sell-variant' check_for_license 'SPDX-License-Identifier: ISC' check_for_license 'SPDX-License-Identifier: MIT' check_for_license 'SPDX-License-Identifier: X11' -- To view, visit https://review.coreboot.org/c/coreboot/+/41221 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I61624b6e54e9aba6e2f54822c1f68967c416ad3d Gerrit-Change-Number: 41221 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newchange

2 2

Change in coreboot[master]: soc/intel/jasperlake: Add SATA related UPDs configuration
by Karthik Ramasubramanian (Code Review) 11 May '20

11 May '20

Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41029 ) Change subject: soc/intel/jasperlake: Add SATA related UPDs configuration ...................................................................... Patch Set 14: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/41029 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4f7e7508b8cd483508293ee3e7b760574d8f025f Gerrit-Change-Number: 41029 Gerrit-PatchSet: 14 Gerrit-Owner: Ronak Kanabar <ronak.kanabar(a)intel.com> Gerrit-Reviewer: Aamir Bohra <aamir.bohra(a)intel.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Reviewer: Maulik V Vaghela <maulik.v.vaghela(a)intel.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Subrata Banik <subrata.banik(a)intel.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Furquan Shaikh <furquan(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-CC: Sridhar Siricilla <sridhar.siricilla(a)intel.com> Gerrit-Comment-Date: Mon, 11 May 2020 19:33:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: util/lint: Also accept BSD-2-Clause
by Patrick Georgi (Code Review) 11 May '20

11 May '20

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41206 ) Change subject: util/lint: Also accept BSD-2-Clause ...................................................................... util/lint: Also accept BSD-2-Clause It's also GPL compatible Change-Id: I3d9243708478f315d91473009ca34786fabffda4 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M util/lint/lint-000-license-headers 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/41206/1 diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers index bea8a5c..5a7e873 100755 --- a/util/lint/lint-000-license-headers +++ b/util/lint/lint-000-license-headers @@ -95,6 +95,7 @@ #search the files for license headers check_for_license 'SPDX-License-Identifier: Apache-2.0' +check_for_license 'SPDX-License-Identifier: BSD-2-Clause' check_for_license 'SPDX-License-Identifier: BSD-3-Clause' check_for_license 'SPDX-License-Identifier: GPL-2.0-only' check_for_license 'SPDX-License-Identifier: GPL-2.0-or-later' -- To view, visit https://review.coreboot.org/c/coreboot/+/41206 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I3d9243708478f315d91473009ca34786fabffda4 Gerrit-Change-Number: 41206 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-MessageType: newchange

3 3

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2020