Change in coreboot[master]: sc7180: enable bl31

[mturney mturney (Code Review)]

Hello [e-mail],

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/35504

to review the following change.

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: ashk 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/include/soc/memlayout.ld
2 files changed, 2 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/1

diff --git a/src/soc/qualcomm/sc7180/Kconfig b/src/soc/qualcomm/sc7180/Kconfig
index df5d116..28f7522 100644
--- a/src/soc/qualcomm/sc7180/Kconfig
+++ b/src/soc/qualcomm/sc7180/Kconfig
@@ -6,6 +6,7 @@
    select ARCH_RAMSTAGE_ARMV8_64
    select ARCH_ROMSTAGE_ARMV8_64
    select ARCH_VERSTAGE_ARMV8_64
+	select ARM64_USE_ARM_TRUSTED_FIRMWARE
    select GENERIC_GPIO_LIB
    select GENERIC_UDELAY
    select HAVE_MONOTONIC_TIMER
diff --git a/src/soc/qualcomm/sc7180/include/soc/memlayout.ld b/src/soc/qualcomm/sc7180/include/soc/memlayout.ld
index f4e6f05..e47f881 100644
--- a/src/soc/qualcomm/sc7180/include/soc/memlayout.ld
+++ b/src/soc/qualcomm/sc7180/include/soc/memlayout.ld
@@ -72,7 +72,7 @@
    REGION(dram_reserved1, 0x80820000, 0x20000, 0x1000)
    REGION(dram_reserved, 0x80900000, 0x200000, 0x1000)
    /* Various hardware/software subsystems make use of this area */
-	BL31(0x85000000, 0x1A800000)
+	BL31(0x80C00000, 0x1A800000)
    POSTRAM_CBFS_CACHE(0x9F800000, 384K)
    RAMSTAGE(0x9F860000, 2M)
 }

[mturney mturney (Code Review)]

Hello Julius Werner, [e-mail], build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/35504

to look at the new patch set (#3).

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: ashk 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/include/soc/memlayout.ld
2 files changed, 2 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/3

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

Patch Set 23:

BTW this patch still needs to add 'BL31_MAKEARGS += PLAT=sc7180' to Makefile.inc to really work.

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

Patch Set 26:

Can you please add

BL31_MAKEARGS += PLAT=sc7180

to the Makefile here as well? It keeps causing friction when I have to tell people to do that manually if they want to build TF from source.

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

Patch Set 31:

(1 comment)

https://review.coreboot.org/c/coreboot/+/35504/31//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/35504/31//COMMIT_MSG@11 
PS31, Line 11: 
Please also add a 'BL31_MAKEARGS += PLAT=sc7180' to sc7180/Makefile.inc with this patch.

[mturney mturney (Code Review)]

Hello Julius Werner, [e-mail], Ravi kumar, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/35504

to look at the new patch set (#32).

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 3 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/32

[Ravi Kumar Bokka (Code Review)]

Ravi Kumar Bokka has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

Patch Set 32:

(1 comment)

https://review.coreboot.org/c/coreboot/+/35504/31//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/35504/31//COMMIT_MSG@11 
PS31, Line 11:
> Please also add a 'BL31_MAKEARGS += PLAT=sc7180' to sc7180/Makefile.inc with this patch.

Done

[mturney mturney (Code Review)]

Hello Julius Werner, [e-mail], Ravi kumar, build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/35504

to look at the new patch set (#45).

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 3 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/45

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

Patch Set 45: Code-Review+2

[Ravi kumar (Code Review)]

Ravi kumar has uploaded a new patch set (#47) to the change originally created by mturney mturney. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 3 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/47

[Ravi kumar (Code Review)]

Ravi kumar has uploaded a new patch set (#57) to the change originally created by mturney mturney. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 3 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/57

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

Patch Set 59:

(1 comment)

https://review.coreboot.org/c/coreboot/+/35504/59//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/35504/59//COMMIT_MSG@7 
PS59, Line 7: sc7180
qualcomm/sc7180: Enable bl31

Change in coreboot[master]: qualcomm/sc7180: Enable bl31

[Ravi kumar (Code Review)]

Ravi kumar has uploaded a new patch set (#62) to the change originally created by mturney mturney. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: qualcomm/sc7180: Enable bl31
......................................................................

qualcomm/sc7180: Enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 3 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/62

Change in coreboot[master]: qualcomm/sc7180: Enable bl31

[Ravi Kumar Bokka (Code Review)]

Ravi Kumar Bokka has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: qualcomm/sc7180: Enable bl31
......................................................................

Patch Set 62:

(1 comment)

https://review.coreboot.org/c/coreboot/+/35504/59//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/35504/59//COMMIT_MSG@7 
PS59, Line 7: sc7180
> qualcomm/sc7180: Enable bl31

Done

[Manideep Kurumella (Code Review)]

Manideep Kurumella has uploaded a new patch set (#63) to the change originally created by mturney mturney. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 3 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/63

[Ravi kumar (Code Review)]

Ravi kumar has uploaded a new patch set (#69) to the change originally created by mturney mturney. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 3 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/69

[Ravi kumar (Code Review)]

Ravi kumar has uploaded a new patch set (#77) to the change originally created by mturney mturney. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/sc7180/Kconfig
1 file changed, 1 insertion(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/77

[Ravi kumar (Code Review)]

Ravi kumar has uploaded a new patch set (#79) to the change originally created by mturney mturney. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 5 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/79

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

Patch Set 79:

(1 comment)

https://review.coreboot.org/c/coreboot/+/35504/79/src/soc/qualcomm/sc7180/Ma... 
File src/soc/qualcomm/sc7180/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/35504/79/src/soc/qualcomm/sc7180/Ma... 
PS79, Line 76: endif # CONFIG_QC_SDI_ENABLE 
trailing whitespace

[mturney mturney (Code Review)]

Hello Ravi kumar, build bot (Jenkins), Patrick Georgi, Martin Roth, Julius Werner, [e-mail],

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/35504

to look at the new patch set (#80).

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 5 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/80

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

Patch Set 80: Code-Review+2

[Ravi kumar (Code Review)]

Ravi kumar has uploaded a new patch set (#83) to the change originally created by mturney mturney. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 8 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/35504/83

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

Patch Set 83: Code-Review+2

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

Patch Set 89:

It won't let me merge these any further for some reason, please rebase again.

[Julius Werner (Code Review)]

Julius Werner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35504 )

Change subject: sc7180: enable bl31
......................................................................

sc7180: enable bl31

Developer/Reviewer, be aware of this patch from Napali:
https://review.coreboot.org/c/coreboot/+/28014/44

Change-Id: Ia961ee0e30478e21fd786ce464655977449df510
Signed-off-by: Ashwin Kumar 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35504
Tested-by: build bot (Jenkins) 
Reviewed-by: Julius Werner 
---
M src/soc/qualcomm/sc7180/Kconfig
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Julius Werner: Looks good to me, approved

diff --git a/src/soc/qualcomm/sc7180/Kconfig b/src/soc/qualcomm/sc7180/Kconfig
index db7350f..17df0d0 100644
--- a/src/soc/qualcomm/sc7180/Kconfig
+++ b/src/soc/qualcomm/sc7180/Kconfig
@@ -6,6 +6,7 @@
    select ARCH_RAMSTAGE_ARMV8_64
    select ARCH_ROMSTAGE_ARMV8_64
    select ARCH_VERSTAGE_ARMV8_64
+	select ARM64_USE_ARM_TRUSTED_FIRMWARE
    select GENERIC_GPIO_LIB
    select GENERIC_UDELAY
    select HAVE_MONOTONIC_TIMER
diff --git a/src/soc/qualcomm/sc7180/Makefile.inc b/src/soc/qualcomm/sc7180/Makefile.inc
index fc1e3f6..bcb4965 100644
--- a/src/soc/qualcomm/sc7180/Makefile.inc
+++ b/src/soc/qualcomm/sc7180/Makefile.inc
@@ -71,6 +71,13 @@

SC7180_BLOB := $(top)/3rdparty/qc_blobs/sc7180

+ifeq ($(CONFIG_QC_SDI_ENABLE),y)
+BL31_MAKEARGS += QTI_SDI_BUILD=1
+BL31_MAKEARGS += QTISECLIB_PATH=$(SC7180_BLOB)/qtiseclib/libqtisec_dbg.a
+else
+BL31_MAKEARGS += QTISECLIB_PATH=$(SC7180_BLOB)/qtiseclib/libqtisec.a
+endif # CONFIG_QC_SDI_ENABLE
+
 ################################################################################
 ifeq ($(CONFIG_QC_SDI_ENABLE),y)
 QCSDI_FILE := $(SC7180_BLOB)/boot/QcSdi.elf