mb/amd/bilby: Add PSP NVRAM and RPMC NVRAM region to flash map

Create PSP NVRAM and RPMC NVRAM region with size 128K & 64K
respectively, which are supported region by the PSP.

moved CBFS up due to build error, CBFS need not to be at the end the flash for amd Zen cpu.

Change-Id: Ide778c61a755697c1bef1eaa87f2976d8ff12eb6
Signed-off-by: Ritul Guru <ritul.bits@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65341
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
diff --git a/src/mainboard/amd/bilby/board.fmd b/src/mainboard/amd/bilby/board.fmd
index c7ba3ee..b27d9d3 100644
--- a/src/mainboard/amd/bilby/board.fmd
+++ b/src/mainboard/amd/bilby/board.fmd
@@ -1,7 +1,9 @@
 FLASH@0xFF000000 16M {
 	BIOS {
 		RW_MRC_CACHE 64K
-		FMAP 4K
 		COREBOOT(CBFS)
+		PSP_NVRAM(PRESERVE) 128K
+		PSP_RPMC_NVRAM(PRESERVE) 64K
+		FMAP 4K
 	}
 }