mb/google/octopus: Fix default FMD

On Apollo Lake/Gemini Lake platforms, FSP requires more than a
simple RW_MRC_CACHE; without the RECOVERY and VAR cache regions,
FSP-m will fail on s3 resume and trigger a full reset instead.

This fixes the default.fmd for octopus to match that used for reef.

Test: build/boot google/ampton, verify sleep/resume works under Linux
with 5.x kernel.

Change-Id: I8565aa93256df7d6e0b359d70e9305f34e5ccb60
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41016
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

src/mainboard/google/octopus/default.fmd

@@ -4,7 +4,11 @@ FLASH 16M {
 		IFWI@0x0 0x1ff000
 		# SMMSTORE requires 64k alignment
 		SMMSTORE@0xa5e000 0x40000
-		RW_MRC_CACHE 0x10000
+		UNIFIED_MRC_CACHE 0x21000 {
+			RECOVERY_MRC_CACHE 0x10000
+			RW_MRC_CACHE 0x10000
+			RW_VAR_MRC_CACHE 0x1000
+		}
 		FMAP 0x300
 		COREBOOT(CBFS)
 		BIOS_UNUSABLE 0x4f000