Nico Huber would like Arthur Heymans and Patrick Rudolph to review this change.
mb/lenovo/*20*: Remove default FMAP
These boards don't need a default FMAP. Moreover, having a default FMAP
disables automatic integration of optional regions like `CONSOLE`.
Also, these files contain an error: `COREBOOT` isn't placed at the top
of the image. Resulting in default builds without a reset vector ;)
Change-Id: If6331e19955034c02828e88902a5934c34d3e784
Signed-off-by: Nico Huber <nico.h@gmx.de>
---
M src/mainboard/lenovo/t420/Kconfig
D src/mainboard/lenovo/t420/board.fmd
M src/mainboard/lenovo/t420s/Kconfig
D src/mainboard/lenovo/t420s/board.fmd
M src/mainboard/lenovo/t520/Kconfig
D src/mainboard/lenovo/t520/board.fmd
M src/mainboard/lenovo/x220/Kconfig
D src/mainboard/lenovo/x220/board.fmd
8 files changed, 0 insertions(+), 68 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/33110/1
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig
index 3d3b56a..02bcc4f 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -46,7 +46,6 @@
config FMDFILE
string
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
config MAINBOARD_DIR
string
diff --git a/src/mainboard/lenovo/t420/board.fmd b/src/mainboard/lenovo/t420/board.fmd
deleted file mode 100644
index 04cf827..0000000
--- a/src/mainboard/lenovo/t420/board.fmd
+++ /dev/null
@@ -1,16 +0,0 @@
-FLASH@0xff800000 0x800000 {
- SI_ALL@0x0 0x500000 {
- SI_DESC@0x0 0x1000
- SI_GBE@0x1000 0x2000
- SI_ME@0x3000 0x4ed000
- }
- SI_BIOS@0x500000 0x300000 {
- RW_MRC_CACHE@0 0x10000
- SMMSTORE(PRESERVE)@0x10000 0x40000
-
- WP_RO@0x50000 0x2a0000 {
- FMAP@0x0 0x800
- COREBOOT(CBFS)@0x1000 0x29f000
- }
- }
-}
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
index 1383d41..60735b0 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -45,7 +45,6 @@
config FMDFILE
string
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
config MAINBOARD_DIR
string
diff --git a/src/mainboard/lenovo/t420s/board.fmd b/src/mainboard/lenovo/t420s/board.fmd
deleted file mode 100644
index 04cf827..0000000
--- a/src/mainboard/lenovo/t420s/board.fmd
+++ /dev/null
@@ -1,16 +0,0 @@
-FLASH@0xff800000 0x800000 {
- SI_ALL@0x0 0x500000 {
- SI_DESC@0x0 0x1000
- SI_GBE@0x1000 0x2000
- SI_ME@0x3000 0x4ed000
- }
- SI_BIOS@0x500000 0x300000 {
- RW_MRC_CACHE@0 0x10000
- SMMSTORE(PRESERVE)@0x10000 0x40000
-
- WP_RO@0x50000 0x2a0000 {
- FMAP@0x0 0x800
- COREBOOT(CBFS)@0x1000 0x29f000
- }
- }
-}
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index ba17e80..e847f8e 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -58,7 +58,6 @@
config FMDFILE
string
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
config MAINBOARD_PART_NUMBER
string
diff --git a/src/mainboard/lenovo/t520/board.fmd b/src/mainboard/lenovo/t520/board.fmd
deleted file mode 100644
index 04cf827..0000000
--- a/src/mainboard/lenovo/t520/board.fmd
+++ /dev/null
@@ -1,16 +0,0 @@
-FLASH@0xff800000 0x800000 {
- SI_ALL@0x0 0x500000 {
- SI_DESC@0x0 0x1000
- SI_GBE@0x1000 0x2000
- SI_ME@0x3000 0x4ed000
- }
- SI_BIOS@0x500000 0x300000 {
- RW_MRC_CACHE@0 0x10000
- SMMSTORE(PRESERVE)@0x10000 0x40000
-
- WP_RO@0x50000 0x2a0000 {
- FMAP@0x0 0x800
- COREBOOT(CBFS)@0x1000 0x29f000
- }
- }
-}
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index 358cf8e..c80c2520 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -53,7 +53,6 @@
config FMDFILE
string
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
config MAINBOARD_PART_NUMBER
string
diff --git a/src/mainboard/lenovo/x220/board.fmd b/src/mainboard/lenovo/x220/board.fmd
deleted file mode 100644
index 04cf827..0000000
--- a/src/mainboard/lenovo/x220/board.fmd
+++ /dev/null
@@ -1,16 +0,0 @@
-FLASH@0xff800000 0x800000 {
- SI_ALL@0x0 0x500000 {
- SI_DESC@0x0 0x1000
- SI_GBE@0x1000 0x2000
- SI_ME@0x3000 0x4ed000
- }
- SI_BIOS@0x500000 0x300000 {
- RW_MRC_CACHE@0 0x10000
- SMMSTORE(PRESERVE)@0x10000 0x40000
-
- WP_RO@0x50000 0x2a0000 {
- FMAP@0x0 0x800
- COREBOOT(CBFS)@0x1000 0x29f000
- }
- }
-}
To view, visit change 33110. To unsubscribe, or for help writing mail filters, visit settings.