Change in coreboot[master]: mb/cavium/cn8100_sff_evb: adjust fmap

[Marcello Sylvester Bauer (Code Review)]

Marcello Sylvester Bauer has uploaded this change for review. ( https://review.coreboot.org/29596

Change subject: mb/cavium/cn8100_sff_evb: adjust fmap
......................................................................

mb/cavium/cn8100_sff_evb: adjust fmap

Adjust the default fmap description file.

Change-Id: I46165eb27314a500187bcd24e3e201cf6a3175e7
Signed-off-by: Marcello Sylvester Bauer 
---
M src/mainboard/cavium/cn8100_sff_evb/Kconfig
M src/mainboard/cavium/cn8100_sff_evb/board.fmd
2 files changed, 8 insertions(+), 17 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/29596/1

diff --git a/src/mainboard/cavium/cn8100_sff_evb/Kconfig b/src/mainboard/cavium/cn8100_sff_evb/Kconfig
index c67c362..b95ddf6 100644
--- a/src/mainboard/cavium/cn8100_sff_evb/Kconfig
+++ b/src/mainboard/cavium/cn8100_sff_evb/Kconfig
@@ -17,7 +17,7 @@

config BOARD_SPECIFIC_OPTIONS
    def_bool y
-	select BOARD_ROMSIZE_KB_16384
+	select BOARD_ROMSIZE_KB_8192
    select COMMON_CBFS_SPI_WRAPPER
    select RTC
    select SOC_CAVIUM_CN81XX
diff --git a/src/mainboard/cavium/cn8100_sff_evb/board.fmd b/src/mainboard/cavium/cn8100_sff_evb/board.fmd
index 1998727..34f3161 100644
--- a/src/mainboard/cavium/cn8100_sff_evb/board.fmd
+++ b/src/mainboard/cavium/cn8100_sff_evb/board.fmd
@@ -1,24 +1,15 @@
 FLASH@0x0 8M {
-	WP_RO@0x0 0x400000 {
-		RO_SECTION@0x0 0x200000 {
+	WP_RO@0x0 0x800000 {
+		RO_SECTION@0x0 0x7fc000 {
+			# 0 - 0x10000 is free for firmware usage.
+			# bootblock starts at 0x20000
+			FMAP@0x0 0x1000
    		# bootblock includes trusted/non-trusted CLIB, CSIB,
    		# and BL1FWs packaged in
    		# src/soc/cavium/common/Makefile.inc.
    		BOOTBLOCK@0x10000 0x70000
-			FMAP@0x90000 0x1000
-			COREBOOT(CBFS)@0x100000 0x100000
+			COREBOOT(CBFS)@0x80000 0x77c000
    	}
+		RO_VPD@0x7fc000 0x4000
    }
-	RW_SECTION_A@0x400000 0xe8000 {
-		VBLOCK_A@0x0 0x2000
-		FW_MAIN_A(CBFS)@0x2000 0xe5f00
-		RW_FWID_A@0xe7f00 0x100
-	}
-	RW_UNUSED@0x4e8000 0x8000
-	RW_ELOG@0x5d8000 0x1000
-	RW_SHARED@0x5e0000 0x10000 {
-		SHARED_DATA@0x0 0x10000
-	}
-	RW_NVRAM@0x5f0000 0x10000
-	CONSOLE@0x700000 0x100000
 }