From 40717046ea15c203c724229afd64e6e7a7af927c Mon Sep 17 00:00:00 2001
From: Vince Liu <vince-wl.liu@mediatek.corp-partner.google.com>
Date: Tue, 10 Dec 2024 15:32:47 +0800
Subject: [PATCH] mb/google/skywalker: Initialize flash controller in bootblock

Initialize SPI NOR Flash Controller (SNFC) in the bootblock to
enable CBFS and execute other stages such as verstage, romstage,
ramstage, etc.

BUG=b:379008996
BRANCH=none
TEST=Read NOR flash data successfully.

Signed-off-by: Noah Shen <noah.shen@mediatek.corp-partner.google.com>
Change-Id: Icf4af32dd9d8c704fd7246adda94dfa3350bb672
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86998
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yidi Lin <yidilin@google.com>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
---
 src/mainboard/google/skywalker/Kconfig     | 4 ++++
 src/mainboard/google/skywalker/bootblock.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/google/skywalker/Kconfig b/src/mainboard/google/skywalker/Kconfig
index a3bed903b2..b3da5482b2 100644
--- a/src/mainboard/google/skywalker/Kconfig
+++ b/src/mainboard/google/skywalker/Kconfig
@@ -27,4 +27,8 @@ config MAINBOARD_DIR
 config MAINBOARD_PART_NUMBER
 	string
 	default "Skywalker" if BOARD_GOOGLE_SKYWALKER
+
+config BOOT_DEVICE_SPI_FLASH_BUS
+	int
+	default 7
 endif
diff --git a/src/mainboard/google/skywalker/bootblock.c b/src/mainboard/google/skywalker/bootblock.c
index af9934e07e..1062d9bbe5 100644
--- a/src/mainboard/google/skywalker/bootblock.c
+++ b/src/mainboard/google/skywalker/bootblock.c
@@ -1,8 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only OR MIT */
 
 #include <bootblock_common.h>
+#include <soc/spi.h>
 
 void bootblock_mainboard_init(void)
 {
-	/* TODO: add mainboard init for bootblock */
+	mtk_snfc_init();
 }