diff options
| -rw-r--r-- | src/mainboard/google/herobrine/Kconfig.name | 7 | ||||
| -rw-r--r-- | src/mainboard/google/trogdor/Kconfig.name | 7 | ||||
| -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 |
5 files changed, 9 insertions, 17 deletions
diff --git a/src/mainboard/google/herobrine/Kconfig.name b/src/mainboard/google/herobrine/Kconfig.name index 06530a0c9e..e779c91bbc 100644 --- a/src/mainboard/google/herobrine/Kconfig.name +++ b/src/mainboard/google/herobrine/Kconfig.name @@ -1,7 +1,5 @@ comment "Herobrine" -if USE_QC_BLOBS - config BOARD_GOOGLE_HEROBRINE bool "-> Herobrine" select BOARD_GOOGLE_HEROBRINE_COMMON @@ -37,8 +35,3 @@ config BOARD_GOOGLE_ZOGLIN config BOARD_GOOGLE_ZOMBIE bool "-> Zombie" select BOARD_GOOGLE_HEROBRINE_COMMON - -endif - -comment "(Herobrine requires 'Allow QC blobs repository')" - depends on !USE_QC_BLOBS diff --git a/src/mainboard/google/trogdor/Kconfig.name b/src/mainboard/google/trogdor/Kconfig.name index db4cff03d0..cc1ffbdd72 100644 --- a/src/mainboard/google/trogdor/Kconfig.name +++ b/src/mainboard/google/trogdor/Kconfig.name @@ -1,7 +1,5 @@ comment "Trogdor" -if USE_QC_BLOBS - config BOARD_GOOGLE_BUBS bool "-> Bubs" select BOARD_GOOGLE_TROGDOR_COMMON @@ -53,8 +51,3 @@ config BOARD_GOOGLE_WORMDINGLER config BOARD_GOOGLE_TROGDOR bool "-> Trogdor" select BOARD_GOOGLE_TROGDOR_COMMON - -endif - -comment "(Trogdor requires 'Allow QC blobs repository')" - depends on !USE_QC_BLOBS 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 |