diff options
| author | Felix Singer <felixsinger@posteo.net> | 2023-11-12 06:32:35 +0000 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2023-11-17 22:17:31 +0000 |
| commit | c5415678349840821e4c29fef7d34098769021bf (patch) | |
| tree | 3e039eef1fd54f3ff76600d439a6a6139f11d6d8 /src/soc | |
| parent | 8ccd314ce6b954a93528897fb029e66bf6078bd8 (diff) | |
soc/qualcomm/{sc7180,sc7280}: Allow building without QC blobs repo
Building coreboot for the Qualcomm SoCs SC7180 and SC7280 requires to
include the Qualcomm blobs, which requires to accept their license.
However, for various reasons it makes sense to build without blobs, e.g.
static analysis or just build-testing.
So in order to do that, run the steps integrating the Qualcomm blobs
into the coreboot binary only if USE_QC_BLOBS is enabled and also remove
guards which prevent building related mainboards when USE_QC_BLOBS is
not enabled.
Change-Id: I249ac477b8f10e7fa0848e967c23a3b3b9bbd27d
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79026
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/qualcomm/sc7180/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/qualcomm/sc7180/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/soc/qualcomm/sc7280/Makefile.inc | 7 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/soc/qualcomm/sc7180/Kconfig b/src/soc/qualcomm/sc7180/Kconfig index 066ff5db1c..f813372b85 100644 --- a/src/soc/qualcomm/sc7180/Kconfig +++ b/src/soc/qualcomm/sc7180/Kconfig @@ -2,7 +2,6 @@ config SOC_QUALCOMM_SC7180 bool default n - depends on USE_QC_BLOBS select ARCH_BOOTBLOCK_ARMV8_64 select ARCH_RAMSTAGE_ARMV8_64 select ARCH_ROMSTAGE_ARMV8_64 diff --git a/src/soc/qualcomm/sc7180/Makefile.inc b/src/soc/qualcomm/sc7180/Makefile.inc index 734691ea0a..ead5720278 100644 --- a/src/soc/qualcomm/sc7180/Makefile.inc +++ b/src/soc/qualcomm/sc7180/Makefile.inc @@ -56,6 +56,8 @@ CPPFLAGS_common += -Isrc/soc/qualcomm/common/include BL31_MAKEARGS += PLAT=sc7180 +ifeq ($(CONFIG_USE_QC_BLOBS),y) + SC7180_BLOB := $(top)/3rdparty/qc_blobs/sc7180 ifeq ($(CONFIG_QC_SDI_ENABLE),y) @@ -150,3 +152,5 @@ $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.elf $(objcbfs)/bootblock.bin endif + +endif diff --git a/src/soc/qualcomm/sc7280/Makefile.inc b/src/soc/qualcomm/sc7280/Makefile.inc index 440148494d..ae23f45ede 100644 --- a/src/soc/qualcomm/sc7280/Makefile.inc +++ b/src/soc/qualcomm/sc7280/Makefile.inc @@ -62,10 +62,11 @@ ramstage-$(CONFIG_SDHCI_CONTROLLER) += sdhci.c ../common/storage/sdhci_msm.c CPPFLAGS_common += -Isrc/soc/qualcomm/sc7280/include CPPFLAGS_common += -Isrc/soc/qualcomm/common/include -SC7280_BLOB := $(top)/3rdparty/qc_blobs/sc7280 +BL31_MAKEARGS += PLAT=sc7280 ################################################################################ -BL31_MAKEARGS += PLAT=sc7280 +ifeq ($(CONFIG_USE_QC_BLOBS),y) +SC7280_BLOB := $(top)/3rdparty/qc_blobs/sc7280 ifeq ($(CONFIG_QC_SDI_ENABLE),y) BL31_MAKEARGS += QTI_SDI_BUILD=1 @@ -175,3 +176,5 @@ $(GSI_FW_CBFS)-compression := $(CBFS_COMPRESS_FLAG) cbfs-files-y += $(GSI_FW_CBFS) endif + +endif |