From 0be087deee20dee48284e867c378d0ebd1b57940 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Sun, 24 Jun 2018 23:00:13 -0700 Subject: mb/google/octopus: Use the newly added override devicetree feature Now that sconfig is able to support variant-specific override trees, this change updates octopus boards to use this feature. Following devices are moved from baseboard devicetree to variant specific devicetree: 1. Touchscreen 2. Trackpad 3. Digitizer 4. Audio codec BUG=b:80081934 TEST=Verified that the right devices show up in static.c for each variant. Change-Id: I8df0cdf4dbcd7613aa4ef4042c272eca2915da9e Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/27219 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/mainboard/google/octopus/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/mainboard/google/octopus/Kconfig') diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index 226e44f7fa..45900c8d79 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -47,9 +47,12 @@ config VARIANT_DIR config DEVICETREE string - default "variants/bip/devicetree.cb" if BOARD_GOOGLE_BIP default "variants/baseboard/devicetree.cb" +config OVERRIDE_DEVICETREE + string + default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" if !BOARD_GOOGLE_OCTOPUS + config MAINBOARD_PART_NUMBER string default "Yorp" if BOARD_GOOGLE_YORP -- cgit v1.2.3