From bf5f325757cf7e9fe084ae84e028602bb99a54a0 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 6 Mar 2023 16:09:26 -0700 Subject: [PATCH] board/system76/rpl: Add board.fmd files per variant Change-Id: If51ae6f4ce71fde6044f9f4d3ae6a9581f48663d --- src/mainboard/system76/rpl/Kconfig | 7 ++++--- src/mainboard/system76/rpl/variants/addw3/board.fmd | 13 +++++++++++++ .../system76/rpl/variants/gaze18/board.fmd | 12 ++++++++++++ .../system76/rpl/variants/oryp11/board.fmd | 12 ++++++++++++ .../system76/rpl/variants/serw13/board.fmd | 12 ++++++++++++ 5 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 src/mainboard/system76/rpl/variants/addw3/board.fmd create mode 100644 src/mainboard/system76/rpl/variants/gaze18/board.fmd create mode 100644 src/mainboard/system76/rpl/variants/oryp11/board.fmd create mode 100644 src/mainboard/system76/rpl/variants/serw13/board.fmd diff --git a/src/mainboard/system76/rpl/Kconfig b/src/mainboard/system76/rpl/Kconfig index 095178f961..3548178c98 100644 --- a/src/mainboard/system76/rpl/Kconfig +++ b/src/mainboard/system76/rpl/Kconfig @@ -5,6 +5,7 @@ config BOARD_SYSTEM76_RPL_COMMON select DRIVERS_INTEL_PMC select DRIVERS_INTEL_USB4_RETIMER select EC_SYSTEM76_EC + select EC_SYSTEM76_EC_LOCKDOWN select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_CMOS_DEFAULT @@ -90,15 +91,15 @@ config MAINBOARD_VERSION default "oryp11" if BOARD_SYSTEM76_ORYP11 default "serw13" if BOARD_SYSTEM76_SERW13 -config CBFS_SIZE - default 0x1000000 - config CONSOLE_POST default y config DIMM_SPD_SIZE default 512 +config FMDFILE + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/variants/\$(CONFIG_VARIANT_DIR)/board.fmd" + config ONBOARD_VGA_IS_PRIMARY default y diff --git a/src/mainboard/system76/rpl/variants/addw3/board.fmd b/src/mainboard/system76/rpl/variants/addw3/board.fmd new file mode 100644 index 0000000000..187263e5cc --- /dev/null +++ b/src/mainboard/system76/rpl/variants/addw3/board.fmd @@ -0,0 +1,13 @@ +FLASH 32M { + SI_DESC 4K + SI_GBE 8K + SI_ME 3944K + SI_BIOS@16M 16M { + RW_MRC_CACHE 64K + SMMSTORE(PRESERVE) 256K + WP_RO { + FMAP 4K + COREBOOT(CBFS) + } + } +} diff --git a/src/mainboard/system76/rpl/variants/gaze18/board.fmd b/src/mainboard/system76/rpl/variants/gaze18/board.fmd new file mode 100644 index 0000000000..fdf1ebdf52 --- /dev/null +++ b/src/mainboard/system76/rpl/variants/gaze18/board.fmd @@ -0,0 +1,12 @@ +FLASH 32M { + SI_DESC 4K + SI_ME 4824K + SI_BIOS@16M 16M { + RW_MRC_CACHE 64K + SMMSTORE(PRESERVE) 256K + WP_RO { + FMAP 4K + COREBOOT(CBFS) + } + } +} diff --git a/src/mainboard/system76/rpl/variants/oryp11/board.fmd b/src/mainboard/system76/rpl/variants/oryp11/board.fmd new file mode 100644 index 0000000000..fdf1ebdf52 --- /dev/null +++ b/src/mainboard/system76/rpl/variants/oryp11/board.fmd @@ -0,0 +1,12 @@ +FLASH 32M { + SI_DESC 4K + SI_ME 4824K + SI_BIOS@16M 16M { + RW_MRC_CACHE 64K + SMMSTORE(PRESERVE) 256K + WP_RO { + FMAP 4K + COREBOOT(CBFS) + } + } +} diff --git a/src/mainboard/system76/rpl/variants/serw13/board.fmd b/src/mainboard/system76/rpl/variants/serw13/board.fmd new file mode 100644 index 0000000000..b2615d1e17 --- /dev/null +++ b/src/mainboard/system76/rpl/variants/serw13/board.fmd @@ -0,0 +1,12 @@ +FLASH 32M { + SI_DESC 4K + SI_ME 3944K + SI_BIOS@16M 16M { + RW_MRC_CACHE 64K + SMMSTORE(PRESERVE) 256K + WP_RO { + FMAP 4K + COREBOOT(CBFS) + } + } +}