Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47529 )
Change subject: mb/google/zork: Assume VBOOT_STARTS_BEFORE_BOOTBLOCK
......................................................................
mb/google/zork: Assume VBOOT_STARTS_BEFORE_BOOTBLOCK
At this point, the zork platform will only use psp_verstage, so remove
the VBOOT_STARTS_IN_BOOTBLOCK option and set code for VBOOT_STARTS-
BEFORE_BOOTBLOCK to always be used.
TEST=Build & Boot Morphius
BRANCH=Zork
BUG=b:172848137
Signed-off-by: Martin Roth <martin(a)coreboot.org>
Change-Id: I30d90fe82c37966a860b52c07a3550dcecf8d19d
---
M src/mainboard/google/zork/Kconfig
M src/mainboard/google/zork/Makefile.inc
M src/mainboard/google/zork/bootblock.c
M src/mainboard/google/zork/variants/baseboard/Makefile.inc
4 files changed, 3 insertions(+), 29 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/47529/1
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index 320f668..0bad802 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -105,6 +105,7 @@
config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select VBOOT_LID_SWITCH
+ select VBOOT_STARTS_BEFORE_BOOTBLOCK
config VBOOT_VBNV_OFFSET
hex
@@ -129,7 +130,7 @@
config PICASSO_FW_A_POSITION
hex
default 0xFF012040
- depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK
+ depends on VBOOT_SLOTS_RW_AB
help
Location of the AMD firmware in the RW_A region. This is the
start of the RW-A region + 64 bytes for the cbfs header.
@@ -137,7 +138,7 @@
config PICASSO_FW_B_POSITION
hex
default 0xFF312040
- depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK
+ depends on VBOOT_SLOTS_RW_AB
help
Location of the AMD firmware in the RW_B region. This is the
start of the RW-A region + 64 bytes for the cbfs header.
@@ -241,22 +242,6 @@
help
Last board version that needs the extra delay for FPMCU init.
-config VBOOT_STARTS_BEFORE_BOOTBLOCK
- bool "PSP verstage"
- default y if VBOOT
- help
- Firmware verification happens before the main processor is brought
- online.
-
-config VBOOT_STARTS_IN_BOOTBLOCK
- bool "X86 verstage (in bootblock)"
- depends on VBOOT && ! VBOOT_STARTS_BEFORE_BOOTBLOCK
- select VBOOT_SEPARATE_VERSTAGE
- help
- Firmware verification happens during the end of or right after the
- bootblock. This implies that a static VBOOT2_WORK() buffer must be
- allocated in memlayout.
-
config EFS_SPI_READ_MODE
int
default 0 if EM100 # Normal read mode
diff --git a/src/mainboard/google/zork/Makefile.inc b/src/mainboard/google/zork/Makefile.inc
index 88aef86..96c97b6 100644
--- a/src/mainboard/google/zork/Makefile.inc
+++ b/src/mainboard/google/zork/Makefile.inc
@@ -9,11 +9,7 @@
ramstage-y += ec.c
ramstage-y += sku_id.c
-ifeq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y)
verstage-y += verstage.c
-else
-verstage-y += chromeos.c
-endif
smm-y += smihandler.c
diff --git a/src/mainboard/google/zork/bootblock.c b/src/mainboard/google/zork/bootblock.c
index ed05888..87e0285 100644
--- a/src/mainboard/google/zork/bootblock.c
+++ b/src/mainboard/google/zork/bootblock.c
@@ -12,10 +12,5 @@
gpios = variant_bootblock_gpio_table(&num_gpios, acpi_get_sleep_type());
program_gpios(gpios, num_gpios);
- if (!CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) {
- gpios = variant_early_gpio_table(&num_gpios);
- program_gpios(gpios, num_gpios);
- }
-
variant_pcie_gpio_configure();
}
diff --git a/src/mainboard/google/zork/variants/baseboard/Makefile.inc b/src/mainboard/google/zork/variants/baseboard/Makefile.inc
index c8d57ff..2764a89 100644
--- a/src/mainboard/google/zork/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/zork/variants/baseboard/Makefile.inc
@@ -7,10 +7,8 @@
verstage-y += gpio_baseboard_common.c
verstage-y += helpers.c
-ifeq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y)
verstage-$(CONFIG_BOARD_GOOGLE_BASEBOARD_TREMBYLE) += gpio_baseboard_trembyle.c
verstage-$(CONFIG_BOARD_GOOGLE_BASEBOARD_DALBOZ) += gpio_baseboard_dalboz.c
-endif
verstage-y += tpm_tis.c
romstage-y += gpio_baseboard_common.c
--
To view, visit https://review.coreboot.org/c/coreboot/+/47529
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I30d90fe82c37966a860b52c07a3550dcecf8d19d
Gerrit-Change-Number: 47529
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Gerrit-MessageType: newchange
Hello Nicolas Boichat,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/46580
to review the following change.
Change subject: HACK: skip reading EDID completely
......................................................................
HACK: skip reading EDID completely
Something goes terribly wrong when reading the EDID, and ANX7625
does not seem to be able to recover from it.
BUG=b:155713214
TEST=boot asurada
Change-Id: I2230af30b709667f9858f6144b14681686003f28
---
M src/drivers/analogix/anx7625/anx7625.c
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/46580/1
diff --git a/src/drivers/analogix/anx7625/anx7625.c b/src/drivers/analogix/anx7625/anx7625.c
index eb7e661..e3f969c 100644
--- a/src/drivers/analogix/anx7625/anx7625.c
+++ b/src/drivers/analogix/anx7625/anx7625.c
@@ -854,7 +854,9 @@
int ret;
u8 edid[FOUR_BLOCK_SIZE];
- block_num = sp_tx_edid_read(bus, edid, FOUR_BLOCK_SIZE);
+ /* Something goes terribly wrong here, and ANX7625 does not seem to be able to recover from it. */
+ if (0)
+ block_num = sp_tx_edid_read(bus, edid, FOUR_BLOCK_SIZE);
block_num=1;
memcpy(edid, &edp_edid, sizeof(edp_edid));
--
To view, visit https://review.coreboot.org/c/coreboot/+/46580
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I2230af30b709667f9858f6144b14681686003f28
Gerrit-Change-Number: 46580
Gerrit-PatchSet: 1
Gerrit-Owner: yongqiang niu <yongqiang.niu(a)mediatek.com>
Gerrit-Reviewer: Nicolas Boichat <drinkcat(a)chromium.org>
Gerrit-MessageType: newchange
Hello Nicolas Boichat,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/46583
to review the following change.
Change subject: HACK: Enable display backlight
......................................................................
HACK: Enable display backlight
Change the polarity so that the backlight is at maximum.
BUG=b:155713214
TEST=boot asurada
Change-Id: I058af933e59be84cca77ea15b668be6efcc6539d
---
M src/mainboard/google/asurada/mainboard.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/46583/1
diff --git a/src/mainboard/google/asurada/mainboard.c b/src/mainboard/google/asurada/mainboard.c
index 30e98e8..56ecc9e 100644
--- a/src/mainboard/google/asurada/mainboard.c
+++ b/src/mainboard/google/asurada/mainboard.c
@@ -56,8 +56,8 @@
/* Set up backlight control pins as output pin and power-off by default */
static void configure_panel_backlight(void)
{
- gpio_output(GPIO(KPROW1), 0);
- gpio_output(GPIO(DISP_PWM), 0);
+ gpio_output(GPIO(KPROW1), 1);
+ gpio_output(GPIO(DISP_PWM), 1);
}
static void power_on_panel(struct panel_description *panel)
--
To view, visit https://review.coreboot.org/c/coreboot/+/46583
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I058af933e59be84cca77ea15b668be6efcc6539d
Gerrit-Change-Number: 46583
Gerrit-PatchSet: 1
Gerrit-Owner: yongqiang niu <yongqiang.niu(a)mediatek.com>
Gerrit-Reviewer: Nicolas Boichat <drinkcat(a)chromium.org>
Gerrit-MessageType: newchange
Hello Nicolas Boichat,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/46581
to review the following change.
Change subject: HACK: First set pwren to 0
......................................................................
HACK: First set pwren to 0
Maybe not 100% necessary, but should still be good practise.
BUG=b:155713214
TEST=boot asurada
Change-Id: Ib8b3366795ae876227546be393681d8ac404e51b
---
M src/mainboard/google/asurada/panel_anx7625.c
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/46581/1
diff --git a/src/mainboard/google/asurada/panel_anx7625.c b/src/mainboard/google/asurada/panel_anx7625.c
index 0145859..10aa305 100644
--- a/src/mainboard/google/asurada/panel_anx7625.c
+++ b/src/mainboard/google/asurada/panel_anx7625.c
@@ -18,6 +18,7 @@
gpio_output(GPIO_PP3300_PANEL, 1);
/* Turn on bridge */
+ gpio_output(GPIO_MIPIBRDG_PWREN, 0);
gpio_output(GPIO_MIPIBRDG_RST_L_1V8, 0);
gpio_output(GPIO_MIPIBRDG_PP1000_EN, 1);
gpio_output(GPIO_MIPIBRDG_PP1800_EN, 1);
--
To view, visit https://review.coreboot.org/c/coreboot/+/46581
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ib8b3366795ae876227546be393681d8ac404e51b
Gerrit-Change-Number: 46581
Gerrit-PatchSet: 1
Gerrit-Owner: yongqiang niu <yongqiang.niu(a)mediatek.com>
Gerrit-Reviewer: Nicolas Boichat <drinkcat(a)chromium.org>
Gerrit-MessageType: newchange
Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47596 )
Change subject: Revert "arch|cpu/x86: Add Kconfig option for x86 reset vector"
......................................................................
Revert "arch|cpu/x86: Add Kconfig option for x86 reset vector"
This partially reverts commit 67910db907fb3d5feacdbfaa40952a88f673795a.
The symbol X86_RESET_VECTOR continues to live, for the time being,
under soc/amd/picasso.
Change-Id: Ib6b2cc2b17133b3207758c72a54abe80fc6356b5
Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
---
M src/arch/x86/Kconfig
M src/arch/x86/id.ld
M src/arch/x86/memlayout.ld
M src/cpu/x86/16bit/reset16.ld
4 files changed, 9 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/47596/1
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 900c9c1..b5e52e6 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -88,16 +88,6 @@
default n
depends on ARCH_X86 && SMP
-config X86_RESET_VECTOR
- hex
- depends on ARCH_X86
- default 0xfffffff0
- help
- Specify the location of the x86 reset vector. In traditional devices
- this must match the architectural reset vector to produce a bootable
- image. Nontraditional designs may use this to position the reset
- vector into its desired location.
-
config RESET_VECTOR_IN_RAM
bool
depends on ARCH_X86
diff --git a/src/arch/x86/id.ld b/src/arch/x86/id.ld
index ea8d7e9..b69a8dc 100644
--- a/src/arch/x86/id.ld
+++ b/src/arch/x86/id.ld
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
SECTIONS {
- . = (CONFIG_X86_RESET_VECTOR - CONFIG_ID_SECTION_OFFSET) + 0x10 - (__id_end - __id_start);
+ . = (0xffffffff - CONFIG_ID_SECTION_OFFSET) - (__id_end - __id_start) + 1;
.id (.): {
KEEP(*(.id))
}
diff --git a/src/arch/x86/memlayout.ld b/src/arch/x86/memlayout.ld
index 3659cc9..cbf887c 100644
--- a/src/arch/x86/memlayout.ld
+++ b/src/arch/x86/memlayout.ld
@@ -28,7 +28,7 @@
#include "car.ld"
#elif ENV_BOOTBLOCK
- BOOTBLOCK(CONFIG_X86_RESET_VECTOR - CONFIG_C_ENV_BOOTBLOCK_SIZE + 0x10,
+ BOOTBLOCK(0xffffffff - CONFIG_C_ENV_BOOTBLOCK_SIZE + 1,
CONFIG_C_ENV_BOOTBLOCK_SIZE)
#include "car.ld"
diff --git a/src/cpu/x86/16bit/reset16.ld b/src/cpu/x86/16bit/reset16.ld
index b90dd04..e00e0b4 100644
--- a/src/cpu/x86/16bit/reset16.ld
+++ b/src/cpu/x86/16bit/reset16.ld
@@ -1,13 +1,15 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* _RESET_VECTOR: typically the top of the ROM */
+/*
+ * _ROMTOP : The top of the ROM used where we
+ * need to put the reset vector.
+ */
SECTIONS {
/* Trigger an error if I have an unuseable start address */
- _TOO_LOW = CONFIG_X86_RESET_VECTOR - 0xfff0;
- _bogus = ASSERT(_start16bit >= _TOO_LOW, "_start16bit too low. Please report.");
-
- . = CONFIG_X86_RESET_VECTOR;
+ _bogus = ASSERT(_start16bit >= 0xffff0000, "_start16bit too low. Please report.");
+ _ROMTOP = 0xfffffff0;
+ . = _ROMTOP;
.reset . : {
*(.reset);
. = 15;
--
To view, visit https://review.coreboot.org/c/coreboot/+/47596
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ib6b2cc2b17133b3207758c72a54abe80fc6356b5
Gerrit-Change-Number: 47596
Gerrit-PatchSet: 1
Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Gerrit-MessageType: newchange