Change in ...coreboot[master]: mainboard/lenovo/t530: Improve configuration

[Philipp Deppenwiese (Code Review)]

Philipp Deppenwiese has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/29816

Change subject: mainboard/lenovo/t530: Improve configuration
......................................................................

mainboard/lenovo/t530: Improve configuration

* Enable vboot support with VBNV CMOS option.
* Add board and vboot-rw-ab fmds.
* Adjust CBFS sizes
* Increase thermal specs for performance version

Change-Id: I28c2fb92d574c8070dbf767adc5839faf4fb47a0
Signed-off-by: Philipp Deppenwiese 
---
M src/mainboard/lenovo/t530/Kconfig
A src/mainboard/lenovo/t530/board.fmd
M src/mainboard/lenovo/t530/cmos.layout
M src/mainboard/lenovo/t530/thermal.h
A src/mainboard/lenovo/t530/vboot-rw-ab.fmd
5 files changed, 83 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/29816/1

diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index 61752d8..04f584c 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -28,6 +28,18 @@

if BOARD_LENOVO_BASEBOARD_T530

+config VBOOT
+	select VBOOT_VBNV_CMOS
+	select VBOOT_NO_BOARD_SUPPORT
+	select GBB_FLAG_DISABLE_LID_SHUTDOWN
+	select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
+	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
+	select GBB_FLAG_DISABLE_FWMP
+
+config VBOOT_VBNV_OFFSET
+	hex
+	default 0x2a
+
 config VARIANT_DIR
    string
    default "t530" if BOARD_LENOVO_T530
@@ -75,4 +87,14 @@
    bool
    default y

+config FMDFILE
+	string
+	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rw-ab.fmd" if VBOOT
+	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
+
+config CBFS_SIZE
+	hex
+	default 0x001d9000 if VBOOT
+	default 0x005ac000
+
 endif
diff --git a/src/mainboard/lenovo/t530/board.fmd b/src/mainboard/lenovo/t530/board.fmd
new file mode 100644
index 0000000..74c0e15
--- /dev/null
+++ b/src/mainboard/lenovo/t530/board.fmd
@@ -0,0 +1,24 @@
+FLASH 12M {
+	SI_ALL@0x0 0x500000 {
+		SI_DESC@0x0 0x1000
+		SI_GBE@0x1000 0x2000
+		SI_ME@0x3000 0x4fd000
+	}
+	SI_BIOS@0x500000 0x700000 {
+		MISC_RW@0x0 0x60000 {
+			RW_MRC_CACHE@0x0 0x10000
+			RW_VPD@0x010000 0x4000
+			SMMSTORE@0x14000 0x40000
+		}
+		WP_RO@0x020000 0x6a0000 {
+			RO_VPD@0x0 0x4000
+			RO_SECTION@0x4000 0x69c000 {
+				FMAP@0x0 0x800
+				RO_FRID@0x800 0x40
+				RO_FRID_PAD@0x840 0x7c0
+				GBB@0x1000 0xef000
+				COREBOOT(CBFS)@0xf0000 0x5ac000
+			}
+		}
+	}
+}
diff --git a/src/mainboard/lenovo/t530/cmos.layout b/src/mainboard/lenovo/t530/cmos.layout
index 3400a4d..aa91229 100644
--- a/src/mainboard/lenovo/t530/cmos.layout
+++ b/src/mainboard/lenovo/t530/cmos.layout
@@ -80,6 +80,7 @@
 #437        3        r       0        unused

440          8       h       0        volume
+448         128      r       0        vbnv

# SandyBridge MRC Scrambler Seed values
 896         32        r       0        mrc_scrambler_seed
diff --git a/src/mainboard/lenovo/t530/thermal.h b/src/mainboard/lenovo/t530/thermal.h
index 0b24ea8..06438e0 100644
--- a/src/mainboard/lenovo/t530/thermal.h
+++ b/src/mainboard/lenovo/t530/thermal.h
@@ -18,9 +18,9 @@
 #define T530_THERMAL_H

/* Temperature which OS will shutdown at */
-	#define CRITICAL_TEMPERATURE	100
+	#define CRITICAL_TEMPERATURE	105

/* Temperature which OS will throttle CPU */
-	#define PASSIVE_TEMPERATURE	90
+	#define PASSIVE_TEMPERATURE	100

#endif /* T530_THERMAL_H */
diff --git a/src/mainboard/lenovo/t530/vboot-rw-ab.fmd b/src/mainboard/lenovo/t530/vboot-rw-ab.fmd
new file mode 100644
index 0000000..f23e6b3
--- /dev/null
+++ b/src/mainboard/lenovo/t530/vboot-rw-ab.fmd
@@ -0,0 +1,34 @@
+FLASH 12M {
+	SI_ALL@0x0 0x500000 {
+		SI_DESC@0x0 0x1000
+		SI_GBE@0x1000 0x2000
+		SI_ME@0x3000 0x4fd000
+	}
+	SI_BIOS@0x500000 0x700000 {
+		MISC_RW@0x0 0x60000 {
+			RW_MRC_CACHE@0x0 0x10000
+			RW_VPD@0x010000 0x4000
+			SMMSTORE@0x14000 0x40000
+		}
+		WP_RO@0x60000 0x2cd000 {
+			RO_VPD@0x0 0x4000
+			RO_SECTION@0x4000 0x2c9000 {
+				FMAP@0x0 0x800
+				RO_FRID@0x800 0x40
+				RO_FRID_PAD@0x840 0x7c0
+				GBB@0x1000 0xef000
+				COREBOOT(CBFS)@0xf0000 0x1d9000
+			}
+		}
+		RW_SECTION_A@0x32d000 0x1e9040 {
+			VBLOCK_A@0x0 0x10000
+			FW_MAIN_A(CBFS)@0x10000 0x1d9000
+			RW_FWID_A@0x1e9000 0x40
+		}
+		RW_SECTION_B@0x516040 0x1e9040 {
+			VBLOCK_B@0x0 0x10000
+			FW_MAIN_B(CBFS)@0x10000 0x1d9000
+			RW_FWID_B@0x1e9000 0x40
+		}
+	}
+}