[coreboot-gerrit] Change in coreboot[master]: mb/google/kukui: Extend FMAP to 8MB layout

[Hung-Te Lin (Code Review)]

Hung-Te Lin has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35612 )

Change subject: mb/google/kukui: Extend FMAP to 8MB layout
......................................................................

mb/google/kukui: Extend FMAP to 8MB layout

The SPI flash component requirement for Kukui family is 8K so we should
update FMAP for that:

- Add more comments to alignment or size recommendation.
- Enlarge RO to 4M, and RW_SECTION_{A,B} both 1M.
- BOOTBLOCK: 32K->128K, aligned with other ARM boards.
- Reorder the sections for better alignment.

BUG=b:134624821
TEST=Built Kukui image and boots on Rev2 units.

Change-Id: Id342d57dc95c6197d05b8a265742a2866c35ae09
Signed-off-by: Hung-Te Lin 
---
M src/mainboard/google/kukui/chromeos.fmd
1 file changed, 24 insertions(+), 21 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/35612/1

diff --git a/src/mainboard/google/kukui/chromeos.fmd b/src/mainboard/google/kukui/chromeos.fmd
index d183273..0b54e84 100644
--- a/src/mainboard/google/kukui/chromeos.fmd
+++ b/src/mainboard/google/kukui/chromeos.fmd
@@ -1,30 +1,33 @@
-FLASH@0x0 0x800000 {
-	WP_RO@0x0 0x200000 {
-		RO_SECTION@0x0 0x1f8000 {
-			BOOTBLOCK@0 32K
-			FMAP@0x8000 0x1000
-			COREBOOT(CBFS)@0x9000 0x1ec000
+FLASH@0x0 8M {
+	WP_RO@0x0 4M {
+		RO_SECTION {
+			BOOTBLOCK 128K
+			FMAP 4K  # Offset better aligned with larger values.
+			COREBOOT(CBFS)
    		GBB 0x2f00
    		RO_FRID 0x100
    	}
-		RO_VPD(PRESERVE)@0x1f8000 0x8000
+		RO_VPD(PRESERVE) 32K  # Recommended size: at least 16K.
    }
-	RW_SECTION_A@0x200000 0x7c000 {
-		VBLOCK_A@0x0 0x2000
-		FW_MAIN_A(CBFS) 0x79f00
+	RW_SECTION_A 1M {
+		VBLOCK_A 8K
+		FW_MAIN_A(CBFS)
    	RW_FWID_A 0x100
    }
-	RW_SHARED@0x27c000 0x1000 {
-		SHARED_DATA@0x0 0x1000
-	}
-	RW_NVRAM(PRESERVE)@0x27d000 0x2000
-	# ELOG driver has hard-coded the size to 4k.
-	RW_ELOG(PRESERVE)@0x27f000 0x1000
-	RW_SECTION_B@0x280000 0x7c000 {
-		VBLOCK_B@0x0 0x2000
-		FW_MAIN_B(CBFS) 0x79f00
+	RW_SECTION_B 1M {
+		VBLOCK_B 8K
+		FW_MAIN_B(CBFS)
    	RW_FWID_B 0x100
    }
-	RW_VPD(PRESERVE)@0x2fc000 0x4000
-	RW_LEGACY(CBFS)@0x300000 0x100000
+	RW_PRESERVE(PRESERVE) 36K {
+		RW_VPD 16K  # Recommended size: at least 8K.
+		RW_NVRAM 8K  # 8K at aligned address.
+		RW_DDR_TRAINING 8K
+		RW_ELOG 4K  # ELOG driver hard-coded 4K size.
+	}
+	RW_UNUSED
+	RW_SHARED 4K {
+		SHARED_DATA 4K  # 4K or less for netboot params.
+	}
+	RW_LEGACY(CBFS) 1M  # Minimal 1M.
 }