diff options
| author | Julius Werner <jwerner@chromium.org> | 2014-06-11 14:16:35 -0700 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2015-01-09 07:06:27 +0100 |
| commit | 22adcd67a27e1a99a743ef26b49ae2afab6fe624 (patch) | |
| tree | e35a6b02b0ff3dd0f189648580350601451f948a /payloads/libpayload/configs | |
| parent | 092cac58dee8fb87e0615d060a9de0f7ec693ee4 (diff) | |
| download | coreboot-22adcd67a27e1a99a743ef26b49ae2afab6fe624.tar.xz | |
libpayload: Introduce new Kconfig to explicitly allow GPL code
There have been leaks of GPL code into libpayload for a while now, for
new features or improvements that require third party code with no
adequate alternative among BSD-licensed software. It seems silly and
counter-productive to keep holding back features and performance
improvements from libpayload for a use-case (proprietary payloads) that
doesn't even seem to be implemented anywhere to date. Open-source
payloads should not need to suffer to appease commercial ones.
Instead, this patch introduces a new Kconfig option to explicitly allow
inclusion of GPL code. It will use Kconfig dependencies and/or Makefile
rules to ensure that no GPL code can end up in the final payload if that
option is unset, allowing proprietary payloads to keep working with the
existing BSD-licensed feature set. New features and patches (that are
sufficiently separate and self-contained to allow guarding through this
config option) can choose whether to import GPL code, and need to depend
on this option if they do.
Also clean up all (known) existing uses of GPL code to depend on the new
option, add some recent third-party imports to the LICENSES file, and
relicense the selfboot.c files to BSD with permission of the author.
BUG=chrome-os-partner:24957
TEST=Compiled Falco and Nyan_Big both with and without the new option,
disassembled output binaries to ensure that memcpy() looks as expected.
Original-Change-Id: I6e3a75b1a8e46291c75a876844c7a01f7d3f2a0e
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/203513
Original-Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
(cherry picked from commit d8e5a9fdf583b5ac861f34baea6a16c4d8536512)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Change-Id: I446fef028264c793b946dd9f765e446bf708b4db
Reviewed-on: http://review.coreboot.org/8118
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'payloads/libpayload/configs')
| -rw-r--r-- | payloads/libpayload/configs/config.arm64-generic | 3 | ||||
| -rw-r--r-- | payloads/libpayload/configs/defconfig | 1 | ||||
| -rw-r--r-- | payloads/libpayload/configs/defconfig-arm | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/payloads/libpayload/configs/config.arm64-generic b/payloads/libpayload/configs/config.arm64-generic index 8ed65f1e09..97d865b953 100644 --- a/payloads/libpayload/configs/config.arm64-generic +++ b/payloads/libpayload/configs/config.arm64-generic @@ -1,12 +1,13 @@ # # Automatically generated make config: don't edit # libpayload version: 0.2.0 -# Wed Dec 31 11:29:14 2014 +# Mon Jan 5 15:06:47 2015 # # # Generic Options # +# CONFIG_LP_GPL is not set # CONFIG_LP_EXPERIMENTAL is not set # CONFIG_LP_OBSOLETE is not set # CONFIG_LP_DEVELOPER is not set diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig index 0a522726f3..1fbd961586 100644 --- a/payloads/libpayload/configs/defconfig +++ b/payloads/libpayload/configs/defconfig @@ -7,6 +7,7 @@ # # Generic Options # +# CONFIG_LP_GPL is not set # CONFIG_LP_EXPERIMENTAL is not set # CONFIG_LP_OBSOLETE is not set # CONFIG_LP_DEVELOPER is not set diff --git a/payloads/libpayload/configs/defconfig-arm b/payloads/libpayload/configs/defconfig-arm index 235220c4ff..862443d342 100644 --- a/payloads/libpayload/configs/defconfig-arm +++ b/payloads/libpayload/configs/defconfig-arm @@ -1,12 +1,13 @@ # # Automatically generated make config: don't edit # libpayload version: 0.2.0 -# Wed Dec 31 11:39:10 2014 +# Mon Jan 5 15:06:15 2015 # # # Generic Options # +# CONFIG_LP_GPL is not set # CONFIG_LP_EXPERIMENTAL is not set # CONFIG_LP_OBSOLETE is not set # CONFIG_LP_DEVELOPER is not set |