From 4435a490cd48d6964e656baeeaec0b48a9053d13 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 1 Sep 2016 16:11:52 -0500 Subject: mainboard/google/reef: prepare sharing directory for variants Instead of completely duplicating the a reference board's directory when doing a variant or follower device start providing a means to share code within a single directory. This change just starts the process from the Kconfig side, but subsequent patches will follow which disentangles the board specific pieces from and common logic. BUG=chrome-os-partner:56677 Change-Id: I96628920d78012e488ec008e35daac9c1be0cf79 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/16417 Tested-by: build bot (Jenkins) Reviewed-by: Duncan Laurie --- src/mainboard/google/reef/Kconfig | 18 +++++++++++------- src/mainboard/google/reef/Kconfig.name | 2 ++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index 0464e2d25e..817fcc9596 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -1,7 +1,6 @@ -if BOARD_GOOGLE_REEF -config BOARD_SPECIFIC_OPTIONS - def_bool y +config BOARD_GOOGLE_BASEBOARD_REEF + def_bool n select SOC_INTEL_APOLLOLAKE select BOARD_ROMSIZE_KB_16384 select EC_GOOGLE_CHROMEEC @@ -10,10 +9,15 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_ACPI_TABLES select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM + +if BOARD_GOOGLE_BASEBOARD_REEF + +config BASEBOARD_REEF_LAPTOP + def_bool n select SYSTEM_TYPE_LAPTOP config CHROMEOS - select LID_SWITCH + select LID_SWITCH if BASEBOARD_REEF_LAPTOP config DRIVERS_I2C_DA7219 default y @@ -30,16 +34,16 @@ config MAINBOARD_DIR config MAINBOARD_PART_NUMBER string - default "Reef" + default "Reef" if BOARD_GOOGLE_REEF config MAINBOARD_FAMILY string - default "Google_Reef" + default "Google_Reef" if BOARD_GOOGLE_REEF config GBB_HWID string depends on CHROMEOS - default "REEF TEST 3240" + default "REEF TEST 3240" if BOARD_GOOGLE_REEF config MAX_CPUS int diff --git a/src/mainboard/google/reef/Kconfig.name b/src/mainboard/google/reef/Kconfig.name index c3c85434a5..926f61dc4a 100644 --- a/src/mainboard/google/reef/Kconfig.name +++ b/src/mainboard/google/reef/Kconfig.name @@ -1,2 +1,4 @@ config BOARD_GOOGLE_REEF bool "Reef" + select BOARD_GOOGLE_BASEBOARD_REEF + select BASEBOARD_REEF_LAPTOP -- cgit v1.2.3