From 36a67e1f3c4e06f24bf340025e39f938bac33f19 Mon Sep 17 00:00:00 2001 From: V Sowmya Date: Wed, 20 May 2020 16:44:21 +0530 Subject: [PATCH] mb/google/hatch: Select the fmd files for hatch baseboard This patch selects the fmd files based on config BOARD_GOOGLE_BASEBOARD_HATCH and also renames them to add the baseboard name and layout size tags. BUG=b:154561163 TEST=Built hatch variants and verified that they select the right fmd files. Signed-off-by: V Sowmya Change-Id: I5d99ae28cc972ffa635adf100b756c36e168a8f8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/41567 Tested-by: build bot (Jenkins) Reviewed-by: Maulik V Vaghela Reviewed-by: Furquan Shaikh --- src/mainboard/google/hatch/Kconfig | 6 +++--- .../hatch/{chromeos-16MiB.fmd => chromeos-hatch-16MiB.fmd} | 0 .../google/hatch/{chromeos.fmd => chromeos-hatch-32MiB.fmd} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename src/mainboard/google/hatch/{chromeos-16MiB.fmd => chromeos-hatch-16MiB.fmd} (100%) rename src/mainboard/google/hatch/{chromeos.fmd => chromeos-hatch-32MiB.fmd} (100%) diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index 7e3b9e3948..5f6ca70ec9 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -87,11 +87,11 @@ config DRIVER_TPM_SPI_BUS config UART_FOR_CONSOLE default 0 -if ROMSTAGE_SPD_CBFS +if BOARD_GOOGLE_BASEBOARD_HATCH config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if BOARD_ROMSIZE_KB_32768 + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-hatch-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-hatch-32MiB.fmd" if BOARD_ROMSIZE_KB_32768 endif if ROMSTAGE_SPD_SMBUS diff --git a/src/mainboard/google/hatch/chromeos-16MiB.fmd b/src/mainboard/google/hatch/chromeos-hatch-16MiB.fmd similarity index 100% rename from src/mainboard/google/hatch/chromeos-16MiB.fmd rename to src/mainboard/google/hatch/chromeos-hatch-16MiB.fmd diff --git a/src/mainboard/google/hatch/chromeos.fmd b/src/mainboard/google/hatch/chromeos-hatch-32MiB.fmd similarity index 100% rename from src/mainboard/google/hatch/chromeos.fmd rename to src/mainboard/google/hatch/chromeos-hatch-32MiB.fmd