From f6081c2deb6cb0bf07634185630f9a94ab5cbbb8 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 28 May 2018 17:09:40 -0600 Subject: mainboard/google/kahlee: move grunt's chromeos.fmd to baseboard The chrmoeos.fmd file will be common across variants, so move it out of of grunt directory and into the variants/baseboard directory. BUG=b:80106042 TEST=Build grunt Change-Id: I259d85f60c5e19e00f7d9149542bcfdcc6dfaf4f Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/26656 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Aaron Durbin --- src/mainboard/google/kahlee/Kconfig | 3 +- .../google/kahlee/variants/baseboard/chromeos.fmd | 41 ++++++++++++++++++++++ .../google/kahlee/variants/grunt/chromeos.fmd | 41 ---------------------- 3 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd delete mode 100644 src/mainboard/google/kahlee/variants/grunt/chromeos.fmd diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig index 24881b57d0..0161fa11cc 100644 --- a/src/mainboard/google/kahlee/Kconfig +++ b/src/mainboard/google/kahlee/Kconfig @@ -64,7 +64,8 @@ config MAINBOARD_FAMILY config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/$(CONFIG_VARIANT_DIR)/chromeos.fmd" if CHROMEOS + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/$(CONFIG_VARIANT_DIR)/chromeos.fmd" if CHROMEOS && BOARD_GOOGLE_KAHLEE + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/baseboard/chromeos.fmd" if CHROMEOS default "" help The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE, diff --git a/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd new file mode 100644 index 0000000000..336aced7f2 --- /dev/null +++ b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd @@ -0,0 +1,41 @@ +FLASH@0xFF000000 0x1000000 { + SI_BIOS@0x0 0x1000000 { + UNIFIED_MRC_CACHE@0x0 0x21000 { + RECOVERY_MRC_CACHE@0x0 0x10000 + RW_MRC_CACHE@0x10000 0x10000 + RW_VAR_MRC_CACHE@0x20000 0x1000 + } + RW_SECTION_A@0x21000 0x21E000 { + VBLOCK_A@0x0 0x10000 + FW_MAIN_A(CBFS)@0x10000 0x20DFC0 + RW_FWID_A@0x21DFC0 0x40 + } + RW_SECTION_B@0x23F000 0x21E000 { + VBLOCK_B@0x0 0x10000 + FW_MAIN_B(CBFS)@0x10000 0x20DFC0 + RW_FWID_B@0x21DFC0 0x40 + } + RW_ELOG@0x45D000 0x4000 + + RW_SHARED@0x461000 0x4000 { + SHARED_DATA@0x0 0x2000 + VBLOCK_DEV@0x2000 0x2000 + } + RW_VPD@0x465000 0x2000 + RW_NVRAM@0x467000 0x5000 + RW_UNUSED@0x46C000 0x14000 + RW_LEGACY@0x480000 0x780000 + + WP_RO@0xC00000 0x400000 { + RO_VPD@0x0 0x4000 + RO_UNUSED@0x4000 0x17B000 + RO_SECTION@0x17F000 0x281000 { + FMAP@0x0 0x800 + RO_FRID@0x800 0x40 + RO_FRID_PAD@0x840 0x7c0 + GBB@0x1000 0x70000 + COREBOOT(CBFS)@0x71000 0x210000 + } + } + } +} diff --git a/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd b/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd deleted file mode 100644 index 336aced7f2..0000000000 --- a/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd +++ /dev/null @@ -1,41 +0,0 @@ -FLASH@0xFF000000 0x1000000 { - SI_BIOS@0x0 0x1000000 { - UNIFIED_MRC_CACHE@0x0 0x21000 { - RECOVERY_MRC_CACHE@0x0 0x10000 - RW_MRC_CACHE@0x10000 0x10000 - RW_VAR_MRC_CACHE@0x20000 0x1000 - } - RW_SECTION_A@0x21000 0x21E000 { - VBLOCK_A@0x0 0x10000 - FW_MAIN_A(CBFS)@0x10000 0x20DFC0 - RW_FWID_A@0x21DFC0 0x40 - } - RW_SECTION_B@0x23F000 0x21E000 { - VBLOCK_B@0x0 0x10000 - FW_MAIN_B(CBFS)@0x10000 0x20DFC0 - RW_FWID_B@0x21DFC0 0x40 - } - RW_ELOG@0x45D000 0x4000 - - RW_SHARED@0x461000 0x4000 { - SHARED_DATA@0x0 0x2000 - VBLOCK_DEV@0x2000 0x2000 - } - RW_VPD@0x465000 0x2000 - RW_NVRAM@0x467000 0x5000 - RW_UNUSED@0x46C000 0x14000 - RW_LEGACY@0x480000 0x780000 - - WP_RO@0xC00000 0x400000 { - RO_VPD@0x0 0x4000 - RO_UNUSED@0x4000 0x17B000 - RO_SECTION@0x17F000 0x281000 { - FMAP@0x0 0x800 - RO_FRID@0x800 0x40 - RO_FRID_PAD@0x840 0x7c0 - GBB@0x1000 0x70000 - COREBOOT(CBFS)@0x71000 0x210000 - } - } - } -} -- cgit v1.2.3