From fc6a4c6c49974fe772d0a138555a7c46f002984b Mon Sep 17 00:00:00 2001
From: Felix Held <felix-coreboot@felixheld.de>
Date: Tue, 22 Sep 2020 03:02:55 +0200
Subject: [PATCH] mb/amd/mandolin: simplify flashmap file

Now that we're using fmaptool to parse the .fmd file, we can use some
short forms and omit unnecessary information.

BUG=b:157068645
TEST=Timeless build for amd/mandolin resulted in identical binary.
BRANCH=zork

Change-Id: I196c7857f165e75b543c1bda650e044b5ad0664e
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45596
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
---
 src/mainboard/amd/mandolin/variants/mandolin/board.fmd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mainboard/amd/mandolin/variants/mandolin/board.fmd b/src/mainboard/amd/mandolin/variants/mandolin/board.fmd
index 382c03066d..2845e640e5 100644
--- a/src/mainboard/amd/mandolin/variants/mandolin/board.fmd
+++ b/src/mainboard/amd/mandolin/variants/mandolin/board.fmd
@@ -1,7 +1,7 @@
-FLASH@0xFF800000 0x800000 {
-	BIOS@0x0 {
-		EC@0x0 0x20000
-		RW_MRC_CACHE@0x20000 0x10000
+FLASH@0xFF800000 8M {
+	BIOS {
+		EC 0x20000
+		RW_MRC_CACHE 64K
 		FMAP 0x1000
 		COREBOOT(CBFS)
 	}