google/cheza: Adjust FMAP to fit new requirements

This patch overhauls the Cheza FMAP, removing some sections we don't
seem to need (RW_CDT, the two RW_XBL_BUFFERs, and the second copy of
RW_DDR_TRAINING), and adding new sections we're going to need soon or
should have had anyway (RO_DDR_TRAINING, RO_FSG, RW_LEGACY).

Make more use of implicit offsets and sizes, because we can and because
it should make future adjustments easier.

Change-Id: I0bd9e59e9cfa162c478c4bd1f048fcac61ad5062
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/28403
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: T Michael Turney <mturney@codeaurora.org>
This commit is contained in:
Julius Werner 2018-08-30 16:29:31 -07:00
parent 672f56166d
commit 3dd4953ac1
1 changed files with 29 additions and 28 deletions

View File

@ -13,40 +13,41 @@
## GNU General Public License for more details. ## GNU General Public License for more details.
## ##
FLASH@0x0 0x800000 { FLASH@0x0 8M {
WP_RO@0x0 0x300000 { WP_RO 4M {
RO_SECTION@0x0 0x2E0000 { RO_SECTION 0x184000 {
BOOTBLOCK@0 128K BOOTBLOCK 96K
COREBOOT(CBFS)@0x20000 0x1E0000 COREBOOT(CBFS)
FMAP@0x200000 0x1000 #TODO: Move FMAP to 2M or 3M once FSG can be smaller
GBB@0x201000 0xDEF00 FMAP@0x180000 0x1000
RO_FRID@0x2DFF00 0x100 GBB 0x2f00
RO_FRID 0x100
} }
RO_VPD@0x2E0000 0x2000 RO_VPD 16K
RO_DDR_TRAINING 8K
RO_FSG
} }
RW_NVRAM@0x300000 0x8000 RW_VPD 32K
RW_ELOG@0x308000 0x8000 RW_NVRAM 16K
RW_VPD@0x310000 0x8000 RW_DDR_TRAINING 8K
RW_CDT@0x318000 0x8000 RW_ELOG 4K
RW_SHARED 4K {
RW_SECTION_A@0x320000 0x268000 { SHARED_DATA
VBLOCK_A@0x0 0x2000
FW_MAIN_A(CBFS)@0x2000 0x1E1F00
RW_FWID_A@0x1E3F00 0x100
RW_DDR_TRAINING_A@0x1E4000 0x4000
RW_XBL_BUFFER_A@0x1E8000 0x4000
} }
RW_SHARED@0x588000 0x10000 { RW_SECTION_A 1280K {
SHARED_DATA@0x0 0x10000 VBLOCK_A 8K
FW_MAIN_A(CBFS)
RW_FWID_A 256
} }
RW_SECTION_B@0x598000 0x268000 {
VBLOCK_B@0x0 0x2000 RW_SECTION_B 1280K {
FW_MAIN_B(CBFS)@0x2000 0x1E1F00 VBLOCK_B 8K
RW_FWID_B@0x1E3F00 0x100 FW_MAIN_B(CBFS)
RW_DDR_TRAINING_B@0x1E4000 0x4000 RW_FWID_B 256
RW_XBL_BUFFER_B@0x1E8000 0x4000
} }
RW_LEGACY(CBFS)
} }