diff options
author | Nico Huber <nico.h@gmx.de> | 2019-05-30 11:48:02 +0200 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2019-05-30 14:57:59 +0000 |
commit | d64f8899728edfb645dde10a1f6f1fb46df13a15 (patch) | |
tree | 1fe95f4537ce94450f24f37189b700c7a8d17ff2 | |
parent | 10490b98e2c8b7b0c6c275b6b809d48697f6ee2f (diff) |
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>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33110
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r-- | src/mainboard/lenovo/t420/Kconfig | 1 | ||||
-rw-r--r-- | src/mainboard/lenovo/t420/board.fmd | 16 | ||||
-rw-r--r-- | src/mainboard/lenovo/t420s/Kconfig | 1 | ||||
-rw-r--r-- | src/mainboard/lenovo/t420s/board.fmd | 16 | ||||
-rw-r--r-- | src/mainboard/lenovo/t520/Kconfig | 1 | ||||
-rw-r--r-- | src/mainboard/lenovo/t520/board.fmd | 16 | ||||
-rw-r--r-- | src/mainboard/lenovo/x220/Kconfig | 1 | ||||
-rw-r--r-- | src/mainboard/lenovo/x220/board.fmd | 16 |
8 files changed, 0 insertions, 68 deletions
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig index 3d3b56ae22..02bcc4f4a4 100644 --- a/src/mainboard/lenovo/t420/Kconfig +++ b/src/mainboard/lenovo/t420/Kconfig @@ -46,7 +46,6 @@ config VBOOT_VBNV_OFFSET 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 04cf827a87..0000000000 --- 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 1383d4166c..60735b049d 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -45,7 +45,6 @@ config VBOOT_VBNV_OFFSET 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 04cf827a87..0000000000 --- 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 ba17e8092b..e847f8e39d 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -58,7 +58,6 @@ config DEVICETREE 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 04cf827a87..0000000000 --- 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 358cf8ec39..c80c2520b2 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -53,7 +53,6 @@ config VARIANT_DIR 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 04cf827a87..0000000000 --- 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 - } - } -} |