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
################################################################################
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: sdm845: Fix broken commits ......................................................................
Patch Set 1: Code-Review+2
mturney mturney has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: sdm845: Fix broken commits ......................................................................
Patch Set 1: Code-Review+1
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: sdm845: Fix broken commits ......................................................................
Patch Set 1:
(2 comments)
https://review.coreboot.org/#/c/32805/1/src/soc/qualcomm/common/Kconfig File src/soc/qualcomm/common/Kconfig:
https://review.coreboot.org/#/c/32805/1/src/soc/qualcomm/common/Kconfig@9 PS1, Line 9: depends on SOC_QUALCOMM_COMMON nit: should probably just use a big
if SOC_QUALCOMM_COMMON
around the whole rest of the file
https://review.coreboot.org/#/c/32805/1/src/soc/qualcomm/common/Makefile.inc File src/soc/qualcomm/common/Makefile.inc:
https://review.coreboot.org/#/c/32805/1/src/soc/qualcomm/common/Makefile.inc... PS1, Line 2: romstage-$(CONFIG_SOC_QUALCOMM_COMMON_MMU) += mmu.c No, please don't change the Makefiles. This part is intentional. Other SoCs (e.g. Rockchip, Mediatek) do the same.
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: sdm845: Fix broken commits ......................................................................
Patch Set 1: -Code-Review
Julius's requests seem reasonable. Removing my +2 so it won't get merged accidentally before those are handled.
Hello mturney mturney, Julius Werner, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32805
to look at the new patch set (#2).
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 M src/soc/qualcomm/sdm845/Kconfig 2 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/32805/2
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: sdm845: Fix broken commits ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/#/c/32805/1/src/soc/qualcomm/common/Kconfig File src/soc/qualcomm/common/Kconfig:
https://review.coreboot.org/#/c/32805/1/src/soc/qualcomm/common/Kconfig@9 PS1, Line 9: depends on SOC_QUALCOMM_COMMON
nit: should probably just use a big […]
Done
https://review.coreboot.org/#/c/32805/1/src/soc/qualcomm/common/Makefile.inc File src/soc/qualcomm/common/Makefile.inc:
https://review.coreboot.org/#/c/32805/1/src/soc/qualcomm/common/Makefile.inc... PS1, Line 2: romstage-$(CONFIG_SOC_QUALCOMM_COMMON_MMU) += mmu.c
No, please don't change the Makefiles. This part is intentional. Other SoCs (e.g. […]
Done. Looks like this is the Intel way.
Hello mturney mturney, Julius Werner, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32805
to look at the new patch set (#3).
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.
Change-Id: I0195fd186ac39dd4258fe0781dd6d3d1b1d1679f Signed-off-by: Patrick Rudolph siro@das-labor.org --- M src/soc/qualcomm/common/Kconfig M src/soc/qualcomm/sdm845/Kconfig 2 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/32805/3
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: sdm845: Fix broken commits ......................................................................
Patch Set 3:
(3 comments)
https://review.coreboot.org/#/c/32805/3//COMMIT_MSG Commit Message:
https://review.coreboot.org/#/c/32805/3//COMMIT_MSG@7 PS3, Line 7: sdm845: Fix broken commits Please give this line some content. At least mention Kconfig.
https://review.coreboot.org/#/c/32805/3//COMMIT_MSG@7 PS3, Line 7: sdm845 It's probably not obvious to everyone that sdm845 is an SoC.
https://review.coreboot.org/#/c/32805/3//COMMIT_MSG@13 PS3, Line 13: I38d086c379a3c2f54d1603a2fed5b33860f7f4d7 Commit hashes preferred.
Hello mturney mturney, Julius Werner, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32805
to look at the new patch set (#4).
Change subject: soc/qualcomm/sdm845: Fix broken Kconfig ......................................................................
soc/qualcomm/sdm845: Fix broken Kconfig
This fixes the following changes, which made qualcomm Kconfig appear on all platforms:
bd0b51c0be1ec2c9a5f02de3c13108c13941e2c2 7a3e46d767890f502b09771e19decc5033e27079
Use proper Kconfig logic.
Change-Id: I0195fd186ac39dd4258fe0781dd6d3d1b1d1679f Signed-off-by: Patrick Rudolph siro@das-labor.org --- M src/soc/qualcomm/common/Kconfig M src/soc/qualcomm/sdm845/Kconfig 2 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/32805/4
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: soc/qualcomm/sdm845: Fix broken Kconfig ......................................................................
Patch Set 4: Code-Review+1
Patch Set 4: Commit message was updated.
Thanks.
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: soc/qualcomm/sdm845: Fix broken Kconfig ......................................................................
Patch Set 4: Code-Review+2
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: soc/qualcomm/sdm845: Fix broken Kconfig ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/#/c/32805/4/src/soc/qualcomm/common/Kconfig File src/soc/qualcomm/common/Kconfig:
https://review.coreboot.org/#/c/32805/4/src/soc/qualcomm/common/Kconfig@13 PS4, Line 13: depends on SOC_QUALCOMM_COMMON nit: this is kind of redundant now.
Hello mturney mturney, Julius Werner, build bot (Jenkins), Nico Huber, Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32805
to look at the new patch set (#5).
Change subject: soc/qualcomm/sdm845: Fix broken Kconfig ......................................................................
soc/qualcomm/sdm845: Fix broken Kconfig
This fixes the following changes, which made qualcomm Kconfig appear on all platforms:
bd0b51c0be1ec2c9a5f02de3c13108c13941e2c2 7a3e46d767890f502b09771e19decc5033e27079
Use proper Kconfig logic.
Change-Id: I0195fd186ac39dd4258fe0781dd6d3d1b1d1679f Signed-off-by: Patrick Rudolph siro@das-labor.org --- M src/soc/qualcomm/common/Kconfig M src/soc/qualcomm/sdm845/Kconfig 2 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/32805/5
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: soc/qualcomm/sdm845: Fix broken Kconfig ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/#/c/32805/4/src/soc/qualcomm/common/Kconfig File src/soc/qualcomm/common/Kconfig:
https://review.coreboot.org/#/c/32805/4/src/soc/qualcomm/common/Kconfig@13 PS4, Line 13: depends on SOC_QUALCOMM_COMMON
nit: this is kind of redundant now.
Done
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: soc/qualcomm/sdm845: Fix broken Kconfig ......................................................................
Patch Set 5: Code-Review+2
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: soc/qualcomm/sdm845: Fix broken Kconfig ......................................................................
Patch Set 5: Code-Review+2
Julius Werner has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32805 )
Change subject: soc/qualcomm/sdm845: Fix broken Kconfig ......................................................................
soc/qualcomm/sdm845: Fix broken Kconfig
This fixes the following changes, which made qualcomm Kconfig appear on all platforms:
bd0b51c0be1ec2c9a5f02de3c13108c13941e2c2 7a3e46d767890f502b09771e19decc5033e27079
Use proper Kconfig logic.
Change-Id: I0195fd186ac39dd4258fe0781dd6d3d1b1d1679f Signed-off-by: Patrick Rudolph siro@das-labor.org Reviewed-on: https://review.coreboot.org/c/coreboot/+/32805 Reviewed-by: Patrick Georgi pgeorgi@google.com Reviewed-by: Julius Werner jwerner@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/qualcomm/common/Kconfig M src/soc/qualcomm/sdm845/Kconfig 2 files changed, 11 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Julius Werner: Looks good to me, approved
diff --git a/src/soc/qualcomm/common/Kconfig b/src/soc/qualcomm/common/Kconfig index f3d1262..8a1f6d6 100644 --- a/src/soc/qualcomm/common/Kconfig +++ b/src/soc/qualcomm/common/Kconfig @@ -1,5 +1,15 @@
+config SOC_QUALCOMM_COMMON + bool + default n + help + Selected by platforms that use the common code. + +if SOC_QUALCOMM_COMMON + config QC_SDI_ENABLE bool default n prompt "Debug Build: enable SDI" + +endif diff --git a/src/soc/qualcomm/sdm845/Kconfig b/src/soc/qualcomm/sdm845/Kconfig index ffb95cb..f6268c9 100644 --- a/src/soc/qualcomm/sdm845/Kconfig +++ b/src/soc/qualcomm/sdm845/Kconfig @@ -10,6 +10,7 @@ select GENERIC_UDELAY select HAVE_MONOTONIC_TIMER select ARM64_USE_ARCH_TIMER + select SOC_QUALCOMM_COMMON
if SOC_QUALCOMM_SDM845
-
Julius Werner (Code Review) -
Martin Roth (Code Review)
-
mturney mturney (Code Review)
-
Nico Huber (Code Review)
-
Patrick Georgi (Code Review)
-
Patrick Rudolph (Code Review)