Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32805
Change subject: sdm845: Fix broken commits ......................................................................
sdm845: Fix broken commits
This fixes the following changes, which made qualcomm Kconfig appear on all platforms:
I073186674a1a593547d1ee1d15c7cd4fd8ad5bc1 I38d086c379a3c2f54d1603a2fed5b33860f7f4d7
Use proper Kconfig logic and add Makefile.inc to build the files.
Change-Id: I0195fd186ac39dd4258fe0781dd6d3d1b1d1679f Signed-off-by: Patrick Rudolph siro@das-labor.org --- M src/soc/qualcomm/common/Kconfig A src/soc/qualcomm/common/Makefile.inc M src/soc/qualcomm/sdm845/Kconfig M src/soc/qualcomm/sdm845/Makefile.inc 4 files changed, 20 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/32805/1
diff --git a/src/soc/qualcomm/common/Kconfig b/src/soc/qualcomm/common/Kconfig index f3d1262..a33e6b8 100644 --- a/src/soc/qualcomm/common/Kconfig +++ b/src/soc/qualcomm/common/Kconfig @@ -1,5 +1,20 @@
+config SOC_QUALCOMM_COMMON + bool + default n + config QC_SDI_ENABLE bool default n + depends on SOC_QUALCOMM_COMMON prompt "Debug Build: enable SDI" + +config SOC_QUALCOMM_COMMON_QCLIB + bool + default n + depends on SOC_QUALCOMM_COMMON + +config SOC_QUALCOMM_COMMON_MMU + bool + default n + depends on SOC_QUALCOMM_COMMON diff --git a/src/soc/qualcomm/common/Makefile.inc b/src/soc/qualcomm/common/Makefile.inc new file mode 100644 index 0000000..70e9d45 --- /dev/null +++ b/src/soc/qualcomm/common/Makefile.inc @@ -0,0 +1,2 @@ +romstage-$(CONFIG_SOC_QUALCOMM_COMMON_QCLIB) += qclib.c +romstage-$(CONFIG_SOC_QUALCOMM_COMMON_MMU) += mmu.c diff --git a/src/soc/qualcomm/sdm845/Kconfig b/src/soc/qualcomm/sdm845/Kconfig index ffb95cb..04383f5 100644 --- a/src/soc/qualcomm/sdm845/Kconfig +++ b/src/soc/qualcomm/sdm845/Kconfig @@ -10,6 +10,9 @@ select GENERIC_UDELAY select HAVE_MONOTONIC_TIMER select ARM64_USE_ARCH_TIMER + select SOC_QUALCOMM_COMMON_QCLIB + select SOC_QUALCOMM_COMMON_MMU + select SOC_QUALCOMM_COMMON
if SOC_QUALCOMM_SDM845
diff --git a/src/soc/qualcomm/sdm845/Makefile.inc b/src/soc/qualcomm/sdm845/Makefile.inc index 78b3568..7504466c 100644 --- a/src/soc/qualcomm/sdm845/Makefile.inc +++ b/src/soc/qualcomm/sdm845/Makefile.inc @@ -25,9 +25,7 @@ romstage-y += clock.c romstage-$(CONFIG_SDM845_QSPI) += qspi.c romstage-y += usb.c -romstage-y += ../common/qclib.c romstage-y += qclib.c -romstage-y += ../common/mmu.c romstage-y += mmu.c
################################################################################