Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/28532
Change subject: mainboards: Add SMMSTORE region in chromeos configs ......................................................................
mainboards: Add SMMSTORE region in chromeos configs
Only for those that are x86 and also have a RW_LEGACY region. The assumption is that all devices touched have 64k block sizes when choosing size and alignment of the region.
Change-Id: I12addb137604f003d1296f34f555dae219330b18 Signed-off-by: Patrick Georgi pgeorgi@google.com --- M src/mainboard/google/auron/chromeos.fmd M src/mainboard/google/beltino/chromeos.fmd M src/mainboard/google/butterfly/chromeos.fmd M src/mainboard/google/cyan/chromeos.fmd M src/mainboard/google/eve/chromeos.fmd M src/mainboard/google/fizz/chromeos.fmd M src/mainboard/google/glados/chromeos.fmd M src/mainboard/google/jecht/chromeos.fmd M src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd M src/mainboard/google/kukui/chromeos.fmd M src/mainboard/google/link/chromeos.fmd M src/mainboard/google/octopus/chromeos.fmd M src/mainboard/google/parrot/chromeos.fmd M src/mainboard/google/poppy/chromeos.fmd M src/mainboard/google/rambi/chromeos.fmd M src/mainboard/google/reef/chromeos.fmd M src/mainboard/google/slippy/chromeos.fmd M src/mainboard/google/stout/chromeos.fmd M src/mainboard/google/zoombini/chromeos.fmd M src/mainboard/intel/cannonlake_rvp/chromeos.fmd M src/mainboard/intel/coffeelake_rvp/chromeos.fmd M src/mainboard/intel/coffeelake_rvp/chromeos_32MB.fmd M src/mainboard/intel/galileo/vboot.fmd M src/mainboard/intel/glkrvp/chromeos.fmd M src/mainboard/intel/kblrvp/chromeos.fmd M src/mainboard/intel/kunimitsu/chromeos.fmd M src/mainboard/intel/strago/chromeos.fmd 27 files changed, 54 insertions(+), 27 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/28532/1
diff --git a/src/mainboard/google/auron/chromeos.fmd b/src/mainboard/google/auron/chromeos.fmd index 0c05ce9..215247f 100644 --- a/src/mainboard/google/auron/chromeos.fmd +++ b/src/mainboard/google/auron/chromeos.fmd @@ -22,7 +22,8 @@ } RW_VPD@0x1f8000 0x2000 RW_UNUSED@0x1fa000 0x6000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/beltino/chromeos.fmd b/src/mainboard/google/beltino/chromeos.fmd index 0c05ce9..215247f 100644 --- a/src/mainboard/google/beltino/chromeos.fmd +++ b/src/mainboard/google/beltino/chromeos.fmd @@ -22,7 +22,8 @@ } RW_VPD@0x1f8000 0x2000 RW_UNUSED@0x1fa000 0x6000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/butterfly/chromeos.fmd b/src/mainboard/google/butterfly/chromeos.fmd index 0071533..14c91d7 100644 --- a/src/mainboard/google/butterfly/chromeos.fmd +++ b/src/mainboard/google/butterfly/chromeos.fmd @@ -23,7 +23,8 @@ RW_ENVIRONMENT@0x1f8000 0x4000 RW_VPD@0x1fc000 0x2000 RW_UNUSED@0x1fe000 0x2000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/cyan/chromeos.fmd b/src/mainboard/google/cyan/chromeos.fmd index 0c05ce9..215247f 100644 --- a/src/mainboard/google/cyan/chromeos.fmd +++ b/src/mainboard/google/cyan/chromeos.fmd @@ -22,7 +22,8 @@ } RW_VPD@0x1f8000 0x2000 RW_UNUSED@0x1fa000 0x6000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/eve/chromeos.fmd b/src/mainboard/google/eve/chromeos.fmd index bdadcf7..145fc7b 100644 --- a/src/mainboard/google/eve/chromeos.fmd +++ b/src/mainboard/google/eve/chromeos.fmd @@ -27,7 +27,8 @@ RW_VPD@0x28000 0x2000 RW_NVRAM@0x2a000 0x6000 } - RW_LEGACY(CBFS)@0x800000 0x200000 + SMMSTORE@0x800000 0x40000 + RW_LEGACY(CBFS)@0x840000 0x1c0000 WP_RO@0xa00000 0x400000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/fizz/chromeos.fmd b/src/mainboard/google/fizz/chromeos.fmd index bdadcf7..145fc7b 100644 --- a/src/mainboard/google/fizz/chromeos.fmd +++ b/src/mainboard/google/fizz/chromeos.fmd @@ -27,7 +27,8 @@ RW_VPD@0x28000 0x2000 RW_NVRAM@0x2a000 0x6000 } - RW_LEGACY(CBFS)@0x800000 0x200000 + SMMSTORE@0x800000 0x40000 + RW_LEGACY(CBFS)@0x840000 0x1c0000 WP_RO@0xa00000 0x400000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/glados/chromeos.fmd b/src/mainboard/google/glados/chromeos.fmd index 58b6127..78c6ab1 100644 --- a/src/mainboard/google/glados/chromeos.fmd +++ b/src/mainboard/google/glados/chromeos.fmd @@ -22,7 +22,8 @@ } RW_VPD@0x7f8000 0x2000 RW_NVRAM@0x7fa000 0x6000 - RW_LEGACY(CBFS)@0x800000 0x200000 + SMMSTORE@0x800000 0x40000 + RW_LEGACY(CBFS)@0x840000 0x1c0000 WP_RO@0xa00000 0x400000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/jecht/chromeos.fmd b/src/mainboard/google/jecht/chromeos.fmd index 0c05ce9..215247f 100644 --- a/src/mainboard/google/jecht/chromeos.fmd +++ b/src/mainboard/google/jecht/chromeos.fmd @@ -22,7 +22,8 @@ } RW_VPD@0x1f8000 0x2000 RW_UNUSED@0x1fa000 0x6000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd index 336aced..f84ed01 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd +++ b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd @@ -24,7 +24,8 @@ RW_VPD@0x465000 0x2000 RW_NVRAM@0x467000 0x5000 RW_UNUSED@0x46C000 0x14000 - RW_LEGACY@0x480000 0x780000 + SMMSTORE@0x480000 0x20000 + RW_LEGACY@0x4a0000 0x760000
WP_RO@0xC00000 0x400000 { RO_VPD@0x0 0x4000 diff --git a/src/mainboard/google/kukui/chromeos.fmd b/src/mainboard/google/kukui/chromeos.fmd index a521b0c..1602f80 100644 --- a/src/mainboard/google/kukui/chromeos.fmd +++ b/src/mainboard/google/kukui/chromeos.fmd @@ -25,5 +25,6 @@ RW_FWID_B@0x77f00 0x100 } RW_VPD@0x2f8000 0x8000 - RW_LEGACY(CBFS)@0x300000 0x100000 + SMMSTORE@0x300000 0x20000 + RW_LEGACY(CBFS)@0x320000 0xe0000 } diff --git a/src/mainboard/google/link/chromeos.fmd b/src/mainboard/google/link/chromeos.fmd index 113fba6..8a06dc2 100644 --- a/src/mainboard/google/link/chromeos.fmd +++ b/src/mainboard/google/link/chromeos.fmd @@ -22,7 +22,8 @@ } RW_VPD@0x1f8000 0x2000 RW_UNUSED@0x1fa000 0x6000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/octopus/chromeos.fmd b/src/mainboard/google/octopus/chromeos.fmd index 5572930..f601adc 100644 --- a/src/mainboard/google/octopus/chromeos.fmd +++ b/src/mainboard/google/octopus/chromeos.fmd @@ -36,7 +36,8 @@ FW_MAIN_B(CBFS)@0x10000 0x46ffc0 RW_FWID_B@0x47ffc0 0x40 } - RW_LEGACY(CBFS)@0xd30000 0x200000 + SMMSTORE@0xd30000 0x40000 + RW_LEGACY(CBFS)@0xd70000 0x1c0000 BIOS_UNUSABLE@0xf30000 0x4f000 DEVICE_EXTENSION@0xf7f000 0x80000 # Currently, it is required that the BIOS region be a multiple of 8KiB. diff --git a/src/mainboard/google/parrot/chromeos.fmd b/src/mainboard/google/parrot/chromeos.fmd index 524399b..5f98229 100644 --- a/src/mainboard/google/parrot/chromeos.fmd +++ b/src/mainboard/google/parrot/chromeos.fmd @@ -23,7 +23,8 @@ RW_ENVIRONMENT@0x1f8000 0x4000 RW_VPD@0x1fc000 0x2000 RW_UNUSED@0x1fe000 0x2000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/poppy/chromeos.fmd b/src/mainboard/google/poppy/chromeos.fmd index bdadcf7..145fc7b 100644 --- a/src/mainboard/google/poppy/chromeos.fmd +++ b/src/mainboard/google/poppy/chromeos.fmd @@ -27,7 +27,8 @@ RW_VPD@0x28000 0x2000 RW_NVRAM@0x2a000 0x6000 } - RW_LEGACY(CBFS)@0x800000 0x200000 + SMMSTORE@0x800000 0x40000 + RW_LEGACY(CBFS)@0x840000 0x1c0000 WP_RO@0xa00000 0x400000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/rambi/chromeos.fmd b/src/mainboard/google/rambi/chromeos.fmd index 0c05ce9..215247f 100644 --- a/src/mainboard/google/rambi/chromeos.fmd +++ b/src/mainboard/google/rambi/chromeos.fmd @@ -22,7 +22,8 @@ } RW_VPD@0x1f8000 0x2000 RW_UNUSED@0x1fa000 0x6000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/reef/chromeos.fmd b/src/mainboard/google/reef/chromeos.fmd index e5cda78..768d322 100644 --- a/src/mainboard/google/reef/chromeos.fmd +++ b/src/mainboard/google/reef/chromeos.fmd @@ -37,7 +37,8 @@ FW_MAIN_B(CBFS)@0x10000 0x46ffc0 RW_FWID_B@0x47ffc0 0x40 } - RW_LEGACY(CBFS)@0xd30000 0x200000 + SMMSTORE@0xd30000 0x40000 + RW_LEGACY(CBFS)@0xd70000 0x1c0000 BIOS_UNUSABLE@0xf30000 0x4f000 DEVICE_EXTENSION@0xf7f000 0x80000 # Currently, it is required that the BIOS region be a multiple of 8KiB. diff --git a/src/mainboard/google/slippy/chromeos.fmd b/src/mainboard/google/slippy/chromeos.fmd index 0c05ce9..215247f 100644 --- a/src/mainboard/google/slippy/chromeos.fmd +++ b/src/mainboard/google/slippy/chromeos.fmd @@ -22,7 +22,8 @@ } RW_VPD@0x1f8000 0x2000 RW_UNUSED@0x1fa000 0x6000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/stout/chromeos.fmd b/src/mainboard/google/stout/chromeos.fmd index 0071533..14c91d7 100644 --- a/src/mainboard/google/stout/chromeos.fmd +++ b/src/mainboard/google/stout/chromeos.fmd @@ -23,7 +23,8 @@ RW_ENVIRONMENT@0x1f8000 0x4000 RW_VPD@0x1fc000 0x2000 RW_UNUSED@0x1fe000 0x2000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/google/zoombini/chromeos.fmd b/src/mainboard/google/zoombini/chromeos.fmd index 4e23bbf..7123a5f 100644 --- a/src/mainboard/google/zoombini/chromeos.fmd +++ b/src/mainboard/google/zoombini/chromeos.fmd @@ -27,7 +27,8 @@ RW_VPD@0x28000 0x2000 RW_NVRAM@0x2a000 0x6000 } - RW_LEGACY(CBFS)@0x700000 0x200000 + SMMSTORE@0x700000 0x40000 + RW_LEGACY(CBFS)@0x740000 0x1c0000 WP_RO@0x900000 0x400000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/intel/cannonlake_rvp/chromeos.fmd b/src/mainboard/intel/cannonlake_rvp/chromeos.fmd index cca80ab..65d22c3 100644 --- a/src/mainboard/intel/cannonlake_rvp/chromeos.fmd +++ b/src/mainboard/intel/cannonlake_rvp/chromeos.fmd @@ -28,7 +28,8 @@ RW_VPD@0x28000 0x2000 RW_NVRAM@0x2a000 0x6000 } - RW_LEGACY(CBFS)@0x700000 0x200000 + SMMSTORE@0x700000 0x40000 + RW_LEGACY(CBFS)@0x740000 0x1c0000 WP_RO@0x900000 0x380000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/intel/coffeelake_rvp/chromeos.fmd b/src/mainboard/intel/coffeelake_rvp/chromeos.fmd index cca80ab..65d22c3 100644 --- a/src/mainboard/intel/coffeelake_rvp/chromeos.fmd +++ b/src/mainboard/intel/coffeelake_rvp/chromeos.fmd @@ -28,7 +28,8 @@ RW_VPD@0x28000 0x2000 RW_NVRAM@0x2a000 0x6000 } - RW_LEGACY(CBFS)@0x700000 0x200000 + SMMSTORE@0x700000 0x40000 + RW_LEGACY(CBFS)@0x740000 0x1c0000 WP_RO@0x900000 0x380000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/intel/coffeelake_rvp/chromeos_32MB.fmd b/src/mainboard/intel/coffeelake_rvp/chromeos_32MB.fmd index be6bfc0..bfbd304 100644 --- a/src/mainboard/intel/coffeelake_rvp/chromeos_32MB.fmd +++ b/src/mainboard/intel/coffeelake_rvp/chromeos_32MB.fmd @@ -28,7 +28,8 @@ RW_VPD@0x28000 0x2000 RW_NVRAM@0x2a000 0x6000 } - RW_LEGACY(CBFS)@0x5d0000 0x200000 + SMMSTORE@0x5d0000 0x40000 + RW_LEGACY(CBFS)@0x610000 0x1c0000 WP_RO@0x7d0000 0x430000 { RO_VPD@0x0 0x4000 RO_SECTION@0x4000 0x42c000 { diff --git a/src/mainboard/intel/galileo/vboot.fmd b/src/mainboard/intel/galileo/vboot.fmd index 55e41e56..efc4a75 100644 --- a/src/mainboard/intel/galileo/vboot.fmd +++ b/src/mainboard/intel/galileo/vboot.fmd @@ -36,7 +36,8 @@ } RW_VPD@0x1f8000 0x2000 RW_NVRAM@0x1fa000 0x6000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/intel/glkrvp/chromeos.fmd b/src/mainboard/intel/glkrvp/chromeos.fmd index 84808ab..e513f7c 100644 --- a/src/mainboard/intel/glkrvp/chromeos.fmd +++ b/src/mainboard/intel/glkrvp/chromeos.fmd @@ -38,7 +38,8 @@ RW_FWID_B@0x4777c0 0x40 } RW_NVRAM@0xd39000 0x6000 - RW_LEGACY(CBFS)@0xd3f000 0x200000 + SMMSTORE@0xd40000 0x40000 + RW_LEGACY(CBFS)@0xd80000 0x1b0000 BIOS_UNUSABLE@0xf3f000 0x40000 DEVICE_EXTENSION@0xf7f000 0x80000 # Currently, it is required that the BIOS region be a multiple of 8KiB. diff --git a/src/mainboard/intel/kblrvp/chromeos.fmd b/src/mainboard/intel/kblrvp/chromeos.fmd index 58b6127..78c6ab1 100644 --- a/src/mainboard/intel/kblrvp/chromeos.fmd +++ b/src/mainboard/intel/kblrvp/chromeos.fmd @@ -22,7 +22,8 @@ } RW_VPD@0x7f8000 0x2000 RW_NVRAM@0x7fa000 0x6000 - RW_LEGACY(CBFS)@0x800000 0x200000 + SMMSTORE@0x800000 0x40000 + RW_LEGACY(CBFS)@0x840000 0x1c0000 WP_RO@0xa00000 0x400000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/intel/kunimitsu/chromeos.fmd b/src/mainboard/intel/kunimitsu/chromeos.fmd index 58b6127..78c6ab1 100644 --- a/src/mainboard/intel/kunimitsu/chromeos.fmd +++ b/src/mainboard/intel/kunimitsu/chromeos.fmd @@ -22,7 +22,8 @@ } RW_VPD@0x7f8000 0x2000 RW_NVRAM@0x7fa000 0x6000 - RW_LEGACY(CBFS)@0x800000 0x200000 + SMMSTORE@0x800000 0x40000 + RW_LEGACY(CBFS)@0x840000 0x1c0000 WP_RO@0xa00000 0x400000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000 diff --git a/src/mainboard/intel/strago/chromeos.fmd b/src/mainboard/intel/strago/chromeos.fmd index 0c05ce9..215247f 100644 --- a/src/mainboard/intel/strago/chromeos.fmd +++ b/src/mainboard/intel/strago/chromeos.fmd @@ -22,7 +22,8 @@ } RW_VPD@0x1f8000 0x2000 RW_UNUSED@0x1fa000 0x6000 - RW_LEGACY(CBFS)@0x200000 0x200000 + SMMSTORE@0x200000 0x40000 + RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { RO_VPD@0x0 0x4000 RO_UNUSED@0x4000 0xc000