Change in ...coreboot[master]: google/kukui: Move some initialization from bootblock to verstage

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30331 )

Change subject: google/kukui: Move some initialization from bootblock to verstage
......................................................................

google/kukui: Move some initialization from bootblock to verstage

MT8183 only allows booting from eMMC, so we have to do eMMC emulation
from an external source, for example EC, which makes the size of
bootblock very important.

This CL moves some initialization steps from bootblock to verstage. This
will save us about 2700 bytes (before compression) / 1024 bytes (after
LZ4 compression) in bootblock. In case of CONFIG_VBOOT is disabled,
these initialization steps will be done in romstage.

BRANCH=none
BUG=b:120588396
TEST=manually boot into kernel

Change-Id: I9968d88c54283ef334d1ab975086d4adb3363bd6
Signed-off-by: You-Cheng Syu 
Reviewed-on: https://review.coreboot.org/c/30331
Tested-by: build bot (Jenkins) 
Reviewed-by: Patrick Georgi 
---
M src/mainboard/google/kukui/Makefile.inc
M src/mainboard/google/kukui/bootblock.c
A src/mainboard/google/kukui/early_init.c
A src/mainboard/google/kukui/early_init.h
M src/mainboard/google/kukui/romstage.c
M src/mainboard/google/kukui/verstage.c
M src/soc/mediatek/mt8183/Makefile.inc
7 files changed, 72 insertions(+), 24 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved

diff --git a/src/mainboard/google/kukui/Makefile.inc b/src/mainboard/google/kukui/Makefile.inc
index 9f8c313..a0556c1 100644
--- a/src/mainboard/google/kukui/Makefile.inc
+++ b/src/mainboard/google/kukui/Makefile.inc
@@ -2,18 +2,19 @@

bootblock-y += boardid.c
 bootblock-y += bootblock.c
-bootblock-y += chromeos.c
 bootblock-y += memlayout.ld
 bootblock-y += reset.c
 decompressor-y += memlayout.ld

verstage-y += chromeos.c
+verstage-y += early_init.c
 verstage-y += reset.c
 verstage-y += verstage.c
 verstage-y += memlayout.ld

romstage-y += boardid.c
 romstage-y += chromeos.c
+romstage-y += early_init.c
 romstage-y += memlayout.ld
 romstage-y += reset.c
 romstage-y += romstage.c
diff --git a/src/mainboard/google/kukui/bootblock.c b/src/mainboard/google/kukui/bootblock.c
index ab537d4..9d6c38b 100644
--- a/src/mainboard/google/kukui/bootblock.c
+++ b/src/mainboard/google/kukui/bootblock.c
@@ -14,28 +14,10 @@
  */

#include <bootblock_common.h>
-#include <gpio.h>
-#include <soc/gpio.h>
-#include <soc/mt8183.h>
 #include <soc/spi.h>

-#include "gpio.h"
-
-#define BOOTBLOCK_EN_L (GPIO(KPROW0))
-#define AP_IN_SLEEP_L (GPIO(SRCLKENA0))
-
 void bootblock_mainboard_init(void)
 {
-	mt8183_early_init();
-
-	setup_chromeos_gpios();
-
-	/* Turn on real eMMC. */
-	gpio_output(BOOTBLOCK_EN_L, 1);
-
-	/* Declare we are in S0 */
-	gpio_output(AP_IN_SLEEP_L, 1);
-
    mtk_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS, SPI_PAD0_MASK, 6 * MHz);
    mtk_spi_init(CONFIG_BOOT_DEVICE_SPI_FLASH_BUS, SPI_PAD0_MASK, 26 * MHz);
 }
diff --git a/src/mainboard/google/kukui/early_init.c b/src/mainboard/google/kukui/early_init.c
new file mode 100644
index 0000000..a16a335
--- /dev/null
+++ b/src/mainboard/google/kukui/early_init.c
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <gpio.h>
+#include <soc/mt8183.h>
+#include <soc/spi.h>
+
+#include "early_init.h"
+#include "gpio.h"
+
+#define BOOTBLOCK_EN_L (GPIO(KPROW0))
+#define AP_IN_SLEEP_L (GPIO(SRCLKENA0))
+
+void mainboard_early_init(void)
+{
+	mt8183_early_init();
+
+	/* Turn on real eMMC and allow communication to EC. */
+	gpio_output(BOOTBLOCK_EN_L, 1);
+
+	setup_chromeos_gpios();
+
+	/* Declare we are in S0 */
+	gpio_output(AP_IN_SLEEP_L, 1);
+
+	mtk_spi_init(CONFIG_DRIVER_TPM_SPI_BUS, SPI_PAD0_MASK, 1 * MHz);
+	gpio_eint_configure(CR50_IRQ, IRQ_TYPE_EDGE_RISING);
+}
diff --git a/src/mainboard/google/kukui/early_init.h b/src/mainboard/google/kukui/early_init.h
new file mode 100644
index 0000000..a849fe8
--- /dev/null
+++ b/src/mainboard/google/kukui/early_init.h
@@ -0,0 +1,21 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __MAINBOARD_GOOGLE_KUKUI_EARLY_INIT_H__
+#define __MAINBOARD_GOOGLE_KUKUI_EARLY_INIT_H__
+
+void mainboard_early_init(void);
+
+#endif
diff --git a/src/mainboard/google/kukui/romstage.c b/src/mainboard/google/kukui/romstage.c
index 629692d..7aad11f 100644
--- a/src/mainboard/google/kukui/romstage.c
+++ b/src/mainboard/google/kukui/romstage.c
@@ -18,8 +18,14 @@
 #include <soc/mmu_operations.h>
 #include <soc/mt6358.h>

+#include "early_init.h"
+
 void platform_romstage_main(void)
 {
+	/* This will be done in verstage if CONFIG_VBOOT is enabled. */
+	if (!IS_ENABLED(CONFIG_VBOOT))
+		mainboard_early_init();
+
    mt6358_init();
    mt_mem_init(get_sdram_config());
    mtk_mmu_after_dram();
diff --git a/src/mainboard/google/kukui/verstage.c b/src/mainboard/google/kukui/verstage.c
index 9bf93bf..c12d1b6 100644
--- a/src/mainboard/google/kukui/verstage.c
+++ b/src/mainboard/google/kukui/verstage.c
@@ -14,13 +14,10 @@
  */

#include <security/vboot/vboot_common.h>
-#include <soc/gpio.h>
-#include <soc/spi.h>

-#include "gpio.h"
+#include "early_init.h"

void verstage_mainboard_init(void)
 {
-	mtk_spi_init(CONFIG_DRIVER_TPM_SPI_BUS, SPI_PAD0_MASK, 1 * MHz);
-	gpio_eint_configure(CR50_IRQ, IRQ_TYPE_EDGE_RISING);
+	mainboard_early_init();
 }
diff --git a/src/soc/mediatek/mt8183/Makefile.inc b/src/soc/mediatek/mt8183/Makefile.inc
index f24fdcc..5770a83 100644
--- a/src/soc/mediatek/mt8183/Makefile.inc
+++ b/src/soc/mediatek/mt8183/Makefile.inc
@@ -29,6 +29,7 @@
 romstage-y += dramc_pi_calibration_api.c
 romstage-y += memory.c
 romstage-$(CONFIG_MEMORY_TEST) += ../common/memory_test.c
+romstage-y += mt8183.c
 romstage-y += ../common/gpio.c gpio.c
 romstage-y += ../common/mmu_operations.c mmu_operations.c
 romstage-y += ../common/pmic_wrap.c pmic_wrap.c mt6358.c