From 20ce4007eb1a7f21621560d9dbcdbd9265dbc520 Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Mon, 28 Oct 2019 15:55:03 -0600 Subject: [PATCH] Makefile, Kconfig: Add AMD dependency for amd_blobs repo Add a Kconfig option for indicating agreement to use the contents of amd_blobs. Users should only download the repo after implicitely agreeing to AMD's License text. No formal documented agreement is required. Update Makfile.inc, similar to other submodules, to initialize and checkout the submodule once the Kconfig option is selected. Change-Id: I4ae807659db16756453dc3db2c51848291c681b8 Signed-off-by: Marshall Dawson Reviewed-on: https://review.coreboot.org/c/coreboot/+/36416 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- Makefile.inc | 3 +++ src/Kconfig | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/Makefile.inc b/Makefile.inc index 3ca113be4d..e8a2d524f6 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -204,6 +204,9 @@ forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/ ifeq ($(CONFIG_PLATFORM_USES_FSP1_0)$(CONFIG_PLATFORM_USES_FSP1_1)$(CONFIG_PLATFORM_USES_FSP2_0),y) forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/fsp)) endif +ifeq ($(CONFIG_USE_AMD_BLOBS),y) +forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/amd_blobs)) +endif endif UPDATED_SUBMODULES:=1 COREBOOT_EXPORTS += UPDATED_SUBMODULES diff --git a/src/Kconfig b/src/Kconfig index 4c71f285eb..0d7c934144 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -235,6 +235,20 @@ config USE_BLOBS might be required for some chipsets or boards. This flag ensures that a "Free" option remains available for users. +config USE_AMD_BLOBS + bool "Allow AMD blobs repository (with license agreement)" + depends on USE_BLOBS + help + This draws in the amd_blobs repository, which contains binary files + distributed by AMD, including VBIOS, PSP bootloaders, SMU firmwares, + etc. Selecting this item to download or clone the repo implies your + agreement to the AMD license agreement. A copy of the license text + may be reviewed by reading Documentation/soc/amd/amdblobs_license.md, + and your copy of the license is present in the repo once downloaded. + + Note that for some products, omitting PSP, SMU images, or other items + may result in a nonbooting coreboot.rom. + config COVERAGE bool "Code coverage support" depends on COMPILER_GCC