[coreboot-gerrit] Change in coreboot[master]: HACK: Julius' changes for v15

[Julius Werner (Code Review)]

Julius Werner has uploaded this change for review. ( https://review.coreboot.org/28783


Change subject: HACK: Julius' changes for v15
......................................................................

HACK: Julius' changes for v15

Change-Id: I0cd7f0f6f49d5eb2492ba0897b0811713c547649
Signed-off-by: Julius Werner <jwerner at chromium.org>
---
M src/arch/arm64/Makefile.inc
M src/mainboard/google/cheza/Kconfig
M src/mainboard/google/cheza/chromeos.c
M src/soc/qualcomm/sdm845/Makefile.inc
4 files changed, 24 insertions(+), 16 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/28783/1

diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 5f8b092..6bb7196 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -156,8 +156,6 @@
 # Build ARM Trusted Firmware (BL31)
 
 ifeq ($(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE),y)
-# temporary change, soc makefile process would pack pre-built bl31
-ifneq ($(CONFIG_SOC_QUALCOMM_SDM845),y)
 
 ifeq ($(CONFIG_ARM64_BL31_EXTERNAL_FILE),"")
 
@@ -237,8 +235,6 @@
 
 endif # CONFIG_ARM64_USE_SECURE_OS
 
-endif # CONFIG_SOC_QUALCOMM_845
-
 endif # CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE
 
 endif # CONFIG_ARCH_RAMSTAGE_ARM64
diff --git a/src/mainboard/google/cheza/Kconfig b/src/mainboard/google/cheza/Kconfig
index 9882b59..6a43c4bc 100644
--- a/src/mainboard/google/cheza/Kconfig
+++ b/src/mainboard/google/cheza/Kconfig
@@ -8,20 +8,27 @@
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
 	select COMMON_CBFS_SPI_WRAPPER
+#	select EC_GOOGLE_CHROMEEC
+#	select EC_GOOGLE_CHROMEEC_RTC
+#	select EC_GOOGLE_CHROMEEC_SPI
+#	select RTC
 	select SOC_QUALCOMM_SDM845
 	select SPI_FLASH
 	select SPI_FLASH_WINBOND
 	select MAINBOARD_HAS_CHROMEOS
+	select MAINBOARD_HAS_TPM2
+	select MAINBOARD_HAS_SPI_TPM_CR50
 
 config CONSOLE_UART_ADDR
 	hex
 	default 0x00A84000
 
 config VBOOT
+#	select EC_GOOGLE_CHROMEEC_SWITCHES
 	select VBOOT_VBNV_FLASH
-	select VBOOT_MOCK_SECDATA
 	select VBOOT_NO_BOARD_SUPPORT
 	select GBB_FLAG_FORCE_DEV_SWITCH_ON
+	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC # only for now, makes testing easier
 
 
 config MAINBOARD_DIR
@@ -32,6 +39,14 @@
 	string
 	default "Google"
 
+config DRIVER_TPM_SPI_BUS
+	hex
+	default 0x5
+
+config EC_GOOGLE_CHROMEEC_SPI_BUS
+	hex
+	default 0xa
+
 ##########################################################
 #### Update below when adding a new derivative board. ####
 ##########################################################
diff --git a/src/mainboard/google/cheza/chromeos.c b/src/mainboard/google/cheza/chromeos.c
index 538e46f..99d8654 100644
--- a/src/mainboard/google/cheza/chromeos.c
+++ b/src/mainboard/google/cheza/chromeos.c
@@ -13,9 +13,15 @@
  * GNU General Public License for more details.
  */
 
+#include <bootmode.h>
 #include <boot/coreboot_tables.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
 
 }
+
+int get_write_protect_state(void)
+{
+	return 0;	/* TODO: implement */
+}
diff --git a/src/soc/qualcomm/sdm845/Makefile.inc b/src/soc/qualcomm/sdm845/Makefile.inc
index 527b1b3..2880d66 100644
--- a/src/soc/qualcomm/sdm845/Makefile.inc
+++ b/src/soc/qualcomm/sdm845/Makefile.inc
@@ -67,6 +67,8 @@
 
 CPPFLAGS_common += -Isrc/soc/qualcomm/sdm845/include
 
+BL31_MAKEARGS += PLAT=sdm845
+
 SDM845_BLOB := $(top)/3rdparty/blobs/soc/qualcomm/sdm845
 
 ################################################################################
@@ -160,17 +162,6 @@
 endif
 
 ################################################################################
-BL31_FILE := $(SDM845_BLOB)/bl31.elf
-bl31_file := $(shell ls $(BL31_FILE))
-ifneq (,$(findstring $(BL31_FILE),$(bl31_file)))
-	BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31
-	$(BL31_CBFS)-file := $(BL31_FILE)
-	$(BL31_CBFS)-type := payload
-	$(BL31_CBFS)-compression := none
-	cbfs-files-y += $(BL31_CBFS)
-endif
-
-################################################################################
 QC_SEC_FILE := $(SDM845_BLOB)/qc_sec.mbn
 qc_sec_file := $(shell ls $(QC_SEC_FILE))
 ifneq (,$(findstring $(QC_SEC_FILE),$(qc_sec_file)))

-- 
To view, visit https://review.coreboot.org/28783
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cd7f0f6f49d5eb2492ba0897b0811713c547649
Gerrit-Change-Number: 28783
Gerrit-PatchSet: 1
Gerrit-Owner: Julius Werner <jwerner at chromium.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180928/924b8ec9/attachment-0001.html>