From eabd97020e19543ad4f60e2fb3bcff64ab25be0f Mon Sep 17 00:00:00 2001
From: Rex-BC Chen <rex-bc.chen@mediatek.com>
Date: Mon, 13 Jun 2022 19:47:43 +0800
Subject: [PATCH] mb/google/geralt: Add NOR-Flash support

Initialize NOR-Flash in the bootblock.

TEST=read nor flash data successfully.
BUG=b:233720142

Signed-off-by: Bo-Chen Chen <rex-bc.chen@mediatek.com>
Change-Id: I8ee24b5b24643bce57eb29682d6d0234a6fe8641
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65622
Reviewed-by: Yidi Lin <yidilin@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/geralt/Kconfig     | 4 ++++
 src/mainboard/google/geralt/bootblock.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/google/geralt/Kconfig b/src/mainboard/google/geralt/Kconfig
index f327a027cd..fcc52cee36 100644
--- a/src/mainboard/google/geralt/Kconfig
+++ b/src/mainboard/google/geralt/Kconfig
@@ -25,4 +25,8 @@ config MAINBOARD_DIR
 config MAINBOARD_PART_NUMBER
 	string
 	default "Geralt" if BOARD_GOOGLE_GERALT
+
+config BOOT_DEVICE_SPI_FLASH_BUS
+	int
+	default 7
 endif
diff --git a/src/mainboard/google/geralt/bootblock.c b/src/mainboard/google/geralt/bootblock.c
index 0413ef2452..88be0ffec1 100644
--- a/src/mainboard/google/geralt/bootblock.c
+++ b/src/mainboard/google/geralt/bootblock.c
@@ -2,8 +2,9 @@
 
 #include <bootblock_common.h>
 #include <device/mmio.h>
+#include <soc/spi.h>
 
 void bootblock_mainboard_init(void)
 {
-	/* TODO: add mainboard init for bootblock */
+	mtk_snfc_init();
 }