GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Felix Singer 2023-11-12 06:32:35 +00:00 committed by Martin L Roth
parent 8ccd314ce6
commit c541567834
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainboard/google/herobrine/Kconfig.name
View File

@ -1,7 +1,5 @@
comment "Herobrine" comment "Herobrine"
if USE_QC_BLOBS
config BOARD_GOOGLE_HEROBRINE config BOARD_GOOGLE_HEROBRINE
bool "-> Herobrine" bool "-> Herobrine"
select BOARD_GOOGLE_HEROBRINE_COMMON select BOARD_GOOGLE_HEROBRINE_COMMON
@ -37,8 +35,3 @@ config BOARD_GOOGLE_ZOGLIN
config BOARD_GOOGLE_ZOMBIE config BOARD_GOOGLE_ZOMBIE
bool "-> Zombie" bool "-> Zombie"
select BOARD_GOOGLE_HEROBRINE_COMMON select BOARD_GOOGLE_HEROBRINE_COMMON
endif
comment "(Herobrine requires 'Allow QC blobs repository')"
depends on !USE_QC_BLOBS

7
src/mainboard/google/trogdor/Kconfig.name
View File

@ -1,7 +1,5 @@
comment "Trogdor" comment "Trogdor"
if USE_QC_BLOBS
config BOARD_GOOGLE_BUBS config BOARD_GOOGLE_BUBS
bool "-> Bubs" bool "-> Bubs"
select BOARD_GOOGLE_TROGDOR_COMMON select BOARD_GOOGLE_TROGDOR_COMMON
@ -53,8 +51,3 @@ config BOARD_GOOGLE_WORMDINGLER
config BOARD_GOOGLE_TROGDOR config BOARD_GOOGLE_TROGDOR
bool "-> Trogdor" bool "-> Trogdor"
select BOARD_GOOGLE_TROGDOR_COMMON select BOARD_GOOGLE_TROGDOR_COMMON
endif
comment "(Trogdor requires 'Allow QC blobs repository')"
depends on !USE_QC_BLOBS

1
src/soc/qualcomm/sc7180/Kconfig
View File

@ -2,7 +2,6 @@
config SOC_QUALCOMM_SC7180 config SOC_QUALCOMM_SC7180
bool bool
default n default n
depends on USE_QC_BLOBS
select ARCH_BOOTBLOCK_ARMV8_64 select ARCH_BOOTBLOCK_ARMV8_64
select ARCH_RAMSTAGE_ARMV8_64 select ARCH_RAMSTAGE_ARMV8_64
select ARCH_ROMSTAGE_ARMV8_64 select ARCH_ROMSTAGE_ARMV8_64

4
src/soc/qualcomm/sc7180/Makefile.inc
View File

@ -56,6 +56,8 @@ CPPFLAGS_common += -Isrc/soc/qualcomm/common/include
BL31_MAKEARGS += PLAT=sc7180 BL31_MAKEARGS += PLAT=sc7180
ifeq ($(CONFIG_USE_QC_BLOBS),y)
SC7180_BLOB := $(top)/3rdparty/qc_blobs/sc7180 SC7180_BLOB := $(top)/3rdparty/qc_blobs/sc7180
ifeq ($(CONFIG_QC_SDI_ENABLE),y) ifeq ($(CONFIG_QC_SDI_ENABLE),y)
@ -150,3 +152,5 @@ $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.elf
$(objcbfs)/bootblock.bin $(objcbfs)/bootblock.bin
endif endif
endif

7
src/soc/qualcomm/sc7280/Makefile.inc
View File

@ -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/sc7280/include
CPPFLAGS_common += -Isrc/soc/qualcomm/common/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) ifeq ($(CONFIG_QC_SDI_ENABLE),y)
BL31_MAKEARGS += QTI_SDI_BUILD=1 BL31_MAKEARGS += QTI_SDI_BUILD=1
@ -175,3 +176,5 @@ $(GSI_FW_CBFS)-compression := $(CBFS_COMPRESS_FLAG)
cbfs-files-y += $(GSI_FW_CBFS) cbfs-files-y += $(GSI_FW_CBFS)
endif endif
endif