diff options
-rw-r--r-- | payloads/Makefile.inc | 10 | ||||
-rw-r--r-- | payloads/coreinfo/Kconfig | 11 | ||||
-rw-r--r-- | payloads/coreinfo/Makefile | 10 | ||||
-rw-r--r-- | payloads/external/LinuxBoot/Kconfig | 10 | ||||
-rw-r--r-- | payloads/external/LinuxBoot/Kconfig.name | 10 | ||||
-rw-r--r-- | payloads/external/LinuxBoot/Makefile | 10 | ||||
-rw-r--r-- | payloads/external/LinuxBoot/targets/linux.mk | 11 | ||||
-rw-r--r-- | payloads/external/LinuxBoot/targets/u-root.mk | 10 | ||||
-rw-r--r-- | payloads/external/Makefile.inc | 11 | ||||
-rw-r--r-- | payloads/external/Memtest86Plus/Makefile | 10 | ||||
-rw-r--r-- | payloads/external/U-Boot/Makefile | 10 | ||||
-rw-r--r-- | payloads/external/Yabits/Makefile | 10 | ||||
-rw-r--r-- | payloads/external/iPXE/Kconfig | 10 | ||||
-rw-r--r-- | payloads/external/iPXE/Makefile | 10 | ||||
-rw-r--r-- | payloads/external/tianocore/Makefile | 10 | ||||
-rw-r--r-- | payloads/libpayload/drivers/storage/Kconfig | 9 | ||||
-rw-r--r-- | payloads/libpayload/drivers/timer/Kconfig | 9 | ||||
-rw-r--r-- | payloads/libpayload/drivers/usb/Kconfig | 10 |
18 files changed, 19 insertions, 162 deletions
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc index 83d3910ce0..8503b0c7eb 100644 --- a/payloads/Makefile.inc +++ b/payloads/Makefile.inc @@ -3,15 +3,7 @@ ## ## Copyright (C) 2016 Google Inc. ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo img/coreinfo-file := payloads/coreinfo/build/coreinfo.elf diff --git a/payloads/coreinfo/Kconfig b/payloads/coreinfo/Kconfig index fd4c1b4a22..44153e303d 100644 --- a/payloads/coreinfo/Kconfig +++ b/payloads/coreinfo/Kconfig @@ -3,17 +3,8 @@ ## ## Copyright (C) 2008 Uwe Hermann <uwe@hermann-uwe.de> ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only -# # For a description of the syntax of this configuration file, # see http://lxr.linux.no/source/Documentation/kbuild/kconfig-language.txt. # diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile index 34c45d9855..b1fb08577d 100644 --- a/payloads/coreinfo/Makefile +++ b/payloads/coreinfo/Makefile @@ -4,15 +4,7 @@ ## Copyright (C) 2008 Advanced Micro Devices, Inc. ## Copyright (C) 2008 Uwe Hermann <uwe@hermann-uwe.de> ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only src := $(CURDIR) srctree := $(src) diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index d132c7e848..5a080450f1 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -3,15 +3,7 @@ ## Copyright (C) 2017 Facebook Inc. ## Copyright (C) 2018 9elements Cyber Security ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only if PAYLOAD_LINUXBOOT diff --git a/payloads/external/LinuxBoot/Kconfig.name b/payloads/external/LinuxBoot/Kconfig.name index c59a8bcee9..703a69f64f 100644 --- a/payloads/external/LinuxBoot/Kconfig.name +++ b/payloads/external/LinuxBoot/Kconfig.name @@ -2,15 +2,7 @@ ## ## Copyright (C) 2017 Facebook Inc. ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only config PAYLOAD_LINUXBOOT bool "LinuxBoot" diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile index 5840e8e211..bb05df2192 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -3,15 +3,7 @@ ## Copyright (C) 2017 Facebook Inc. ## Copyright (C) 2018 9elements Cyber Security ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only project_dir=linuxboot kernel_dir=$(project_dir)/kernel diff --git a/payloads/external/LinuxBoot/targets/linux.mk b/payloads/external/LinuxBoot/targets/linux.mk index 8be0926eb0..aa10d6ce39 100644 --- a/payloads/external/LinuxBoot/targets/linux.mk +++ b/payloads/external/LinuxBoot/targets/linux.mk @@ -3,15 +3,8 @@ ## Copyright (C) 2017 Facebook Inc. ## Copyright (C) 2018 9elements Cyber Security ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only + SHELL := /bin/bash ARCH-$(CONFIG_LINUXBOOT_X86_64)=x86_64 diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk index 28d7dbbb33..bb9b2fdcb4 100644 --- a/payloads/external/LinuxBoot/targets/u-root.mk +++ b/payloads/external/LinuxBoot/targets/u-root.mk @@ -3,15 +3,7 @@ ## Copyright (C) 2017 Facebook Inc. ## Copyright (C) 2018 9elements Cyber Security ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only project_dir=$(shell pwd)/linuxboot go_path_dir=$(project_dir)/go diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 5274581256..2f4ebbe1cd 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -6,17 +6,8 @@ ## Copyright (C) 2015 Google Inc. ## Copyright (C) 2017 Facebook Inc. ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only -###################################################################### # set up payload config and version files for later inclusion ifeq ($(CONFIG_PAYLOAD_SEABIOS),y) PAYLOAD_CONFIG=payloads/external/SeaBIOS/seabios/.config diff --git a/payloads/external/Memtest86Plus/Makefile b/payloads/external/Memtest86Plus/Makefile index b799f9ea71..4f3da371fa 100644 --- a/payloads/external/Memtest86Plus/Makefile +++ b/payloads/external/Memtest86Plus/Makefile @@ -3,15 +3,7 @@ ## ## Copyright (C) 2016 Google Inc. ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only TAG-$(CONFIG_MEMTEST_MASTER)=origin/master NAME-$(CONFIG_MEMTEST_MASTER)=Master diff --git a/payloads/external/U-Boot/Makefile b/payloads/external/U-Boot/Makefile index 5cd89569d7..6026dd1944 100644 --- a/payloads/external/U-Boot/Makefile +++ b/payloads/external/U-Boot/Makefile @@ -3,15 +3,7 @@ ## ## Copyright (C) 2015 Google Inc. ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only # 2019-4 tag STABLE_COMMIT_ID=3c99166441bf3ea325af2da83cfe65430b49c066 diff --git a/payloads/external/Yabits/Makefile b/payloads/external/Yabits/Makefile index ec3c9c5767..788f211bb8 100644 --- a/payloads/external/Yabits/Makefile +++ b/payloads/external/Yabits/Makefile @@ -3,15 +3,7 @@ ## ## Copyright (C) 2016 Google Inc. ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only TAG-$(CONFIG_YABITS_MASTER)=origin/master NAME-$(CONFIG_YABITS_MASTER)=Master diff --git a/payloads/external/iPXE/Kconfig b/payloads/external/iPXE/Kconfig index 1636138039..b213dfdabe 100644 --- a/payloads/external/iPXE/Kconfig +++ b/payloads/external/iPXE/Kconfig @@ -1,15 +1,7 @@ ## ## This file is part of the coreboot project. ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only config PXE prompt "Add a PXE ROM" diff --git a/payloads/external/iPXE/Makefile b/payloads/external/iPXE/Makefile index 489bcfae9c..09812fecc4 100644 --- a/payloads/external/iPXE/Makefile +++ b/payloads/external/iPXE/Makefile @@ -3,15 +3,7 @@ ## ## Copyright (C) 2016 Google Inc. ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only # 2019.3 - Last commit of March 2019 # When updating, change the name both here and in payloads/external/iPXE/Kconfig diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 21bae758da..7e83388ba6 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -3,15 +3,7 @@ ## ## Copyright (C) 2017 Google Inc. ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only # force the shell to bash - the edksetup.sh script doesn't work with dash export SHELL := env bash diff --git a/payloads/libpayload/drivers/storage/Kconfig b/payloads/libpayload/drivers/storage/Kconfig index 04e9a29dd1..d29f5bd849 100644 --- a/payloads/libpayload/drivers/storage/Kconfig +++ b/payloads/libpayload/drivers/storage/Kconfig @@ -1,14 +1,7 @@ ## ## This file is part of the coreboot project. ## -## 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. +## SPDX-License-Identifier: GPL-2.0-only config STORAGE bool "Support for storage devices" diff --git a/payloads/libpayload/drivers/timer/Kconfig b/payloads/libpayload/drivers/timer/Kconfig index e3bd0e96b7..1db23ef351 100644 --- a/payloads/libpayload/drivers/timer/Kconfig +++ b/payloads/libpayload/drivers/timer/Kconfig @@ -1,14 +1,7 @@ ## ## This file is part of the coreboot project. ## -## 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. +## SPDX-License-Identifier: GPL-2.0-only choice prompt "Timer driver" diff --git a/payloads/libpayload/drivers/usb/Kconfig b/payloads/libpayload/drivers/usb/Kconfig index 0d5bf0a86f..a82739f431 100644 --- a/payloads/libpayload/drivers/usb/Kconfig +++ b/payloads/libpayload/drivers/usb/Kconfig @@ -1,15 +1,7 @@ ## ## This file is part of the coreboot project. ## -## 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. -## +## SPDX-License-Identifier: GPL-2.0-only config USB bool "USB Support" |