[coreboot-gerrit] Change in coreboot[master]: mainboard/google/poppy: Prepare sharing directory for variants
Furquan Shaikh (Code Review)
gerrit at coreboot.org
Sat Apr 15 23:56:54 CEST 2017
Furquan Shaikh has uploaded a new change for review. ( https://review.coreboot.org/19321 )
Change subject: mainboard/google/poppy: Prepare sharing directory for variants
......................................................................
mainboard/google/poppy: Prepare sharing directory for variants
Clean up Kconfig file in order to support variants for poppy. Add
BOARD_GOOGLE_BASEBOARD_POPPY that can be set by various poppy variants
to use the common baseboard configs.
BUG=b:37375693
Change-Id: I399ecc8c3efb3af26e1fcf60fe2c75b24769fc0f
Signed-off-by: Furquan Shaikh <furquan at chromium.org>
---
M src/mainboard/google/poppy/Kconfig
M src/mainboard/google/poppy/Kconfig.name
2 files changed, 30 insertions(+), 27 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/19321/1
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 0626a32..ce74b45 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -1,45 +1,29 @@
-if BOARD_GOOGLE_POPPY
-config BOARD_SPECIFIC_OPTIONS
- def_bool y
+config BOARD_GOOGLE_BASEBOARD_POPPY
+ def_bool n
select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_16384
select DRIVERS_I2C_GENERIC
select DRIVERS_I2C_HID
+ select DRIVERS_I2C_MAX98927
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_LPC
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_USES_FSP2_0
- select DRIVERS_I2C_MAX98927
select NO_FADT_8042
select SOC_INTEL_KABYLAKE
-config VBOOT
- select EC_GOOGLE_CHROMEEC_SWITCHES
- select VBOOT_LID_SWITCH
+if BOARD_GOOGLE_BASEBOARD_POPPY
+
+config DRIVER_TPM_SPI_BUS
+ default 0x1
config GBB_HWID
string
depends on CHROMEOS
- default "POPPY TEST 8294"
-
-config MAINBOARD_DIR
- string
- default "google/poppy"
-
-config MAINBOARD_PART_NUMBER
- string
- default "Poppy"
-
-config MAINBOARD_FAMILY
- string
- default "Google_Poppy"
-
-config MAX_CPUS
- int
- default 8
+ default "POPPY TEST 8294" if BOARD_GOOGLE_POPPY
config INCLUDE_NHLT_BLOBS
bool "Include blobs for audio."
@@ -47,7 +31,22 @@
select NHLT_DMIC_4CH
select NHLT_MAX98927
select NHLT_RT5663
-endif
+
+config MAINBOARD_DIR
+ string
+ default "google/poppy"
+
+config MAINBOARD_FAMILY
+ string
+ default "Google_Poppy" if BOARD_GOOGLE_POPPY
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "Poppy" if BOARD_GOOGLE_POPPY
+
+config MAX_CPUS
+ int
+ default 8
# Select this option to enable use of cr50 SPI TPM on poppy.
# This option is disabled by default.
@@ -59,5 +58,8 @@
select SPI_TPM
select TPM2
-config DRIVER_TPM_SPI_BUS
- default 0x1
+config VBOOT
+ select EC_GOOGLE_CHROMEEC_SWITCHES
+ select VBOOT_LID_SWITCH
+
+endif # BOARD_GOOGLE_BASEBOARD_POPPY
diff --git a/src/mainboard/google/poppy/Kconfig.name b/src/mainboard/google/poppy/Kconfig.name
index 745fd38..b579ea8 100644
--- a/src/mainboard/google/poppy/Kconfig.name
+++ b/src/mainboard/google/poppy/Kconfig.name
@@ -1,2 +1,3 @@
config BOARD_GOOGLE_POPPY
bool "Poppy"
+ select BOARD_GOOGLE_BASEBOARD_POPPY
--
To view, visit https://review.coreboot.org/19321
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I399ecc8c3efb3af26e1fcf60fe2c75b24769fc0f
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Furquan Shaikh <furquan at google.com>
More information about the coreboot-gerrit
mailing list