Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10707
-gerrit
commit 4e48c7d4ce7ef36296339bcd70cba326a800953f
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Mon Jun 29 23:08:44 2015 +0200
drivers/i2c/tpm: push tpm driver from verstage to libverstage
That way it's available wherever the verstage code ends up, bootblock,
verstage or romstage.
Change-Id: I0665e297f199acd60cff93e1b39812f183115d33
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
---
src/drivers/i2c/tpm/Makefile.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/drivers/i2c/tpm/Makefile.inc b/src/drivers/i2c/tpm/Makefile.inc
index e601136..6b003ed 100644
--- a/src/drivers/i2c/tpm/Makefile.inc
+++ b/src/drivers/i2c/tpm/Makefile.inc
@@ -1,3 +1,3 @@
ramstage-$(CONFIG_I2C_TPM) += tis.c tpm.c
romstage-$(CONFIG_I2C_TPM) += tis.c tpm.c
-verstage-$(CONFIG_I2C_TPM) += tis.c tpm.c
+libverstage-$(CONFIG_I2C_TPM) += tis.c tpm.c
Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10705
-gerrit
commit 09adc2bfcfda557860058c931cdac2e238127385
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Mon Jun 29 22:52:26 2015 +0200
google/cosmos: romstage needs the accessor functions for buttons
In Chrome OS mode, the romstage tries to interpret the various buttons on the
device, so it needs access to the accessor functions.
Change-Id: Iecfd37e79883d826e15c474d77095fbbbb2b7cea
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
---
src/mainboard/google/cosmos/Makefile.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mainboard/google/cosmos/Makefile.inc b/src/mainboard/google/cosmos/Makefile.inc
index 0ab2491..e8c0869 100644
--- a/src/mainboard/google/cosmos/Makefile.inc
+++ b/src/mainboard/google/cosmos/Makefile.inc
@@ -26,6 +26,7 @@ verstage-y += chromeos.c
verstage-y += reset.c
romstage-y += boardid.c
+romstage-y += chromeos.c
romstage-y += romstage.c
romstage-y += reset.c
Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10704
-gerrit
commit 19fb9a107075d8aa15667ed718c8901cb8ba7272
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Mon Jun 29 22:52:26 2015 +0200
google/storm: romstage needs the accessor functions for buttons
In Chrome OS mode, the romstage tries to interpret the various buttons on the
device, so it needs access to the accessor functions.
Change-Id: I59a4f892ca84d475d8f46c8f8c1906dae10ad32d
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
---
src/mainboard/google/storm/Makefile.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mainboard/google/storm/Makefile.inc b/src/mainboard/google/storm/Makefile.inc
index 68828c6..8eccc3e 100644
--- a/src/mainboard/google/storm/Makefile.inc
+++ b/src/mainboard/google/storm/Makefile.inc
@@ -31,6 +31,7 @@ verstage-y += reset.c
romstage-y += romstage.c
romstage-y += cdp.c
+romstage-y += chromeos.c
romstage-y += mmu.c
romstage-y += reset.c
Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10703
-gerrit
commit 5cbe38fe39e7fd838f9911c8e8bdafe07006c216
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Mon Jun 29 22:50:45 2015 +0200
qualcomm/ipq806x: Fix uart in verstage
An old Kconfig symbol from Chrome OS survived into the Makefile (but is
nowhere declared or used). Use the same symbol as for uart.c in the other
stages.
Change-Id: I7a6f1b82254e888d6f2d65d6cff87c4d546ec097
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
---
src/soc/qualcomm/ipq806x/Makefile.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/soc/qualcomm/ipq806x/Makefile.inc b/src/soc/qualcomm/ipq806x/Makefile.inc
index b348423..84eae0b 100644
--- a/src/soc/qualcomm/ipq806x/Makefile.inc
+++ b/src/soc/qualcomm/ipq806x/Makefile.inc
@@ -32,7 +32,7 @@ libverstage-y += i2c.c
libverstage-y += qup.c
libverstage-y += spi.c
verstage-y += timer.c
-verstage-$(CONFIG_CONSOLE_SERIAL_IPQ806X) += uart.c
+verstage-$(CONFIG_DRIVERS_UART) += uart.c
romstage-y += clock.c
romstage-y += blobs_init.c
Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10702
-gerrit
commit b4396bdf3e59dff19d8c7a6ced23dc4cbb749b32
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Mon Jun 29 22:49:26 2015 +0200
qualcomm/ipq806x: centralize vboot configuration
vboot configuration (separate stage or not, which stage loads romstage)
depends on SoC properties (eg. amount of SRAM), not on board specifics, so
move this part of the configuration to the SoC.
Change-Id: I70b4cd1794ddf2aba7cdae94859ea1d76ae019f4
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
---
src/mainboard/google/storm/Kconfig | 1 -
src/soc/qualcomm/ipq806x/Kconfig | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index c6c75ee..1989640 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -29,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVERS_I2C_WW_RING
select HAVE_HARD_RESET
select MAINBOARD_HAS_CHROMEOS
- select RETURN_FROM_VERSTAGE
select SPI_FLASH
select SPI_FLASH_SPANSION
select SPI_FLASH_STMICRO
diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig
index 7f8937c..ecc52e2 100644
--- a/src/soc/qualcomm/ipq806x/Kconfig
+++ b/src/soc/qualcomm/ipq806x/Kconfig
@@ -10,6 +10,8 @@ config SOC_QC_IPQ806X
select HAVE_UART_SPECIAL
select SPI_ATOMIC_SEQUENCING
select GENERIC_GPIO_LIB
+ select SEPARATE_VERSTAGE
+ select RETURN_FROM_VERSTAGE
if SOC_QC_IPQ806X
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10677
-gerrit
commit 3dda624998c231071cb5c7c1237efcf843b3c9b7
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Fri Jun 26 17:34:56 2015 -0700
vboot2: Enable VBOOT_DYNAMIC_WORK_BUFFER on x86
Change-Id: Iaadbd52d948000d1ed46865b83bdb0f4926ca429
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
src/vendorcode/google/chromeos/vboot2/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/vendorcode/google/chromeos/vboot2/Kconfig b/src/vendorcode/google/chromeos/vboot2/Kconfig
index 3106737..c5c46e5 100644
--- a/src/vendorcode/google/chromeos/vboot2/Kconfig
+++ b/src/vendorcode/google/chromeos/vboot2/Kconfig
@@ -118,6 +118,7 @@ config VBOOT_BL31_INDEX
config VBOOT_DYNAMIC_WORK_BUFFER
bool "Vboot's work buffer is dynamically allocated."
+ default y if ARCH_ROMSTAGE_X86_32
default n
depends on VBOOT_VERIFY_FIRMWARE
help
Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10700
-gerrit
commit 0e3320586eb35859e3b44971194be71b315e95b5
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Mon Jun 29 22:13:53 2015 +0200
arch/arm64: Avoid race condition when building bl31
The arm-trusted-firmware build system may not create the final bl31.elf file
atomically, confusing our make to try to use it before it's ready.
Hence insert a (hopefully, but not guaranteed to be atomic) file move.
Change-Id: Iffc80467e0f4bbc96fc62414d4abfaa7b42634f4
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
---
src/arch/arm64/Makefile.inc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 86d6f7d..4cf012a 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -195,12 +195,12 @@ BL31_MAKEARGS += DEBUG=1
endif # CONFIG_CONSOLE_SERIAL
# Avoid build/release|build/debug distinction by overriding BUILD_PLAT directly
-BL31_MAKEARGS += BUILD_PLAT="$(top)/$(obj)/3rdparty/arm-trusted-firmware"
+BL31_MAKEARGS += BUILD_PLAT="$(abspath $(obj)/3rdparty/arm-trusted-firmware)"
BL31_CFLAGS := -fno-pic -fno-stack-protector
BL31_LDFLAGS := --emit-relocs
-BL31 := $(obj)/3rdparty/arm-trusted-firmware/bl31/bl31.elf
+BL31 := $(obj)/bl31.elf
$(BL31):
@printf " MAKE $(subst $(obj)/,,$(@))\n"
@@ -208,6 +208,7 @@ $(BL31):
CFLAGS="$(BL31_CFLAGS)" \
LDFLAGS="$(BL31_LDFLAGS)" \
$(MAKE) -C $(BL31_SOURCE) $(BL31_MAKEARGS) bl31
+ mv $(obj)/3rdparty/arm-trusted-firmware/bl31/bl31.elf $@
.PHONY: $(BL31)