diff --git a/src/mainboard/google/auron/chromeos.fmd b/src/mainboard/google/auron/chromeos.fmd index 0c05ce95ce..215247f582 100644 --- a/src/mainboard/google/auron/chromeos.fmd +++ b/src/mainboard/google/auron/chromeos.fmd @@ -22,7 +22,8 @@ FLASH@0xff800000 0x800000 { } 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 0c05ce95ce..215247f582 100644 --- a/src/mainboard/google/beltino/chromeos.fmd +++ b/src/mainboard/google/beltino/chromeos.fmd @@ -22,7 +22,8 @@ FLASH@0xff800000 0x800000 { } 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 0071533939..14c91d7967 100644 --- a/src/mainboard/google/butterfly/chromeos.fmd +++ b/src/mainboard/google/butterfly/chromeos.fmd @@ -23,7 +23,8 @@ FLASH@0xff800000 0x800000 { 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 0c05ce95ce..215247f582 100644 --- a/src/mainboard/google/cyan/chromeos.fmd +++ b/src/mainboard/google/cyan/chromeos.fmd @@ -22,7 +22,8 @@ FLASH@0xff800000 0x800000 { } 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 bdadcf728d..145fc7bffa 100644 --- a/src/mainboard/google/eve/chromeos.fmd +++ b/src/mainboard/google/eve/chromeos.fmd @@ -27,7 +27,8 @@ FLASH@0xff000000 0x1000000 { 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 bdadcf728d..145fc7bffa 100644 --- a/src/mainboard/google/fizz/chromeos.fmd +++ b/src/mainboard/google/fizz/chromeos.fmd @@ -27,7 +27,8 @@ FLASH@0xff000000 0x1000000 { 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 58b612781f..78c6ab1908 100644 --- a/src/mainboard/google/glados/chromeos.fmd +++ b/src/mainboard/google/glados/chromeos.fmd @@ -22,7 +22,8 @@ FLASH@0xff000000 0x1000000 { } 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 0c05ce95ce..215247f582 100644 --- a/src/mainboard/google/jecht/chromeos.fmd +++ b/src/mainboard/google/jecht/chromeos.fmd @@ -22,7 +22,8 @@ FLASH@0xff800000 0x800000 { } 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 336aced7f2..f84ed01108 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd +++ b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd @@ -24,7 +24,8 @@ FLASH@0xFF000000 0x1000000 { 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 a521b0c1a3..1602f809ce 100644 --- a/src/mainboard/google/kukui/chromeos.fmd +++ b/src/mainboard/google/kukui/chromeos.fmd @@ -25,5 +25,6 @@ FLASH@0x0 0x800000 { 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 113fba6e6f..8a06dc2e48 100644 --- a/src/mainboard/google/link/chromeos.fmd +++ b/src/mainboard/google/link/chromeos.fmd @@ -22,7 +22,8 @@ FLASH@0xff800000 0x800000 { } 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 5572930657..f601adc5e3 100644 --- a/src/mainboard/google/octopus/chromeos.fmd +++ b/src/mainboard/google/octopus/chromeos.fmd @@ -36,7 +36,8 @@ FLASH 16M { 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 524399b9ef..5f98229df8 100644 --- a/src/mainboard/google/parrot/chromeos.fmd +++ b/src/mainboard/google/parrot/chromeos.fmd @@ -23,7 +23,8 @@ FLASH@0xff800000 0x800000 { 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 bdadcf728d..145fc7bffa 100644 --- a/src/mainboard/google/poppy/chromeos.fmd +++ b/src/mainboard/google/poppy/chromeos.fmd @@ -27,7 +27,8 @@ FLASH@0xff000000 0x1000000 { 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 0c05ce95ce..215247f582 100644 --- a/src/mainboard/google/rambi/chromeos.fmd +++ b/src/mainboard/google/rambi/chromeos.fmd @@ -22,7 +22,8 @@ FLASH@0xff800000 0x800000 { } 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 e5cda78b59..768d322a2d 100644 --- a/src/mainboard/google/reef/chromeos.fmd +++ b/src/mainboard/google/reef/chromeos.fmd @@ -37,7 +37,8 @@ FLASH 16M { 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 0c05ce95ce..215247f582 100644 --- a/src/mainboard/google/slippy/chromeos.fmd +++ b/src/mainboard/google/slippy/chromeos.fmd @@ -22,7 +22,8 @@ FLASH@0xff800000 0x800000 { } 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 0071533939..14c91d7967 100644 --- a/src/mainboard/google/stout/chromeos.fmd +++ b/src/mainboard/google/stout/chromeos.fmd @@ -23,7 +23,8 @@ FLASH@0xff800000 0x800000 { 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 4e23bbfec5..7123a5f9ad 100644 --- a/src/mainboard/google/zoombini/chromeos.fmd +++ b/src/mainboard/google/zoombini/chromeos.fmd @@ -27,7 +27,8 @@ FLASH@0xff000000 0x1000000 { 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 cca80ab6a4..65d22c3950 100644 --- a/src/mainboard/intel/cannonlake_rvp/chromeos.fmd +++ b/src/mainboard/intel/cannonlake_rvp/chromeos.fmd @@ -28,7 +28,8 @@ FLASH@0xff000000 0x1000000 { 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 cca80ab6a4..65d22c3950 100644 --- a/src/mainboard/intel/coffeelake_rvp/chromeos.fmd +++ b/src/mainboard/intel/coffeelake_rvp/chromeos.fmd @@ -28,7 +28,8 @@ FLASH@0xff000000 0x1000000 { 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 be6bfc07b6..bfbd304d36 100644 --- a/src/mainboard/intel/coffeelake_rvp/chromeos_32MB.fmd +++ b/src/mainboard/intel/coffeelake_rvp/chromeos_32MB.fmd @@ -28,7 +28,8 @@ FLASH@0xfe000000 0x2000000 { 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 55e41e56aa..efc4a7587a 100644 --- a/src/mainboard/intel/galileo/vboot.fmd +++ b/src/mainboard/intel/galileo/vboot.fmd @@ -36,7 +36,8 @@ FLASH@0xff800000 0x800000 { } 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 84808abeef..e513f7cbf7 100644 --- a/src/mainboard/intel/glkrvp/chromeos.fmd +++ b/src/mainboard/intel/glkrvp/chromeos.fmd @@ -38,7 +38,8 @@ FLASH 16M { 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 58b612781f..78c6ab1908 100644 --- a/src/mainboard/intel/kblrvp/chromeos.fmd +++ b/src/mainboard/intel/kblrvp/chromeos.fmd @@ -22,7 +22,8 @@ FLASH@0xff000000 0x1000000 { } 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 58b612781f..78c6ab1908 100644 --- a/src/mainboard/intel/kunimitsu/chromeos.fmd +++ b/src/mainboard/intel/kunimitsu/chromeos.fmd @@ -22,7 +22,8 @@ FLASH@0xff000000 0x1000000 { } 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 0c05ce95ce..215247f582 100644 --- a/src/mainboard/intel/strago/chromeos.fmd +++ b/src/mainboard/intel/strago/chromeos.fmd @@ -22,7 +22,8 @@ FLASH@0xff800000 0x800000 { } 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