From 8fb4c9d95685c140a0a76c13d90610bb1db50d25 Mon Sep 17 00:00:00 2001
From: Sean Rhodes <sean@starlabs.systems>
Date: Mon, 12 Sep 2022 11:01:42 +0100
Subject: [PATCH] mb/starlabs/starbook/tgl: Tidy up the layout

Tidy up the layout to remove unnecessary sizes. This change also makes
the flash start at 0x0 and increases the size of the FMAP to 0x1000.

Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: I46663003857eb50271c6ad1da6c4e56c8f4bb6c3
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67542
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 .../starlabs/starbook/variants/tgl/board.fmd  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/mainboard/starlabs/starbook/variants/tgl/board.fmd b/src/mainboard/starlabs/starbook/variants/tgl/board.fmd
index 932739e1e4..e7405bee77 100644
--- a/src/mainboard/starlabs/starbook/variants/tgl/board.fmd
+++ b/src/mainboard/starlabs/starbook/variants/tgl/board.fmd
@@ -1,18 +1,14 @@
-#
-# Manually defined FMD in order to ensure that space is reserved for the EC
-# at the top of the BIOS region.
-#
-FLASH@0xff000000 0x1000000 {
-	SI_ALL@0x0 0x500000 {
-		SI_DESC@0x0 0x1000
-		SI_ME@0x1000
+FLASH	0x1000000 {
+	SI_ALL	0x500000 {
+		SI_DESC			0x1000
+		SI_ME
 	}
-	SI_BIOS@0x500000 0xB00000 {
-		EC@0x0 0x20000
-		RW_MRC_CACHE@0x20000 0x10000
-		SMMSTORE@0x30000 0x40000
-		CONSOLE@0x70000 0x20000
-		FMAP@0x90000 0x800
+	SI_BIOS	0xb00000 {
+		EC@0x0			0x20000
+		RW_MRC_CACHE@0x20000	0x10000
+		SMMSTORE@0x30000	0x40000
+		CONSOLE@0x70000		0x20000
+		FMAP@0x90000		0x1000
 		COREBOOT(CBFS)
 	}
 }