From 45e11aa0a573aba1e4d8ae8dcd2cc87a8ca87dab Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 18 Dec 2016 11:59:58 -0600 Subject: Add/Combine Broadwell Chromebooks using variant board scheme Combine existing boards google/auron_paine and google/samus with new ChromeOS devices auron_yuna, gandof and lulu, using their common reference board (auron) as a base. Chromium sources used: firmware-yuna-6301.59.B 6ed8b9d [CHERRY-PICK: broadwell: Update to...] firmware-gandof-6301.155.B 666f34f [gandof: modify power limiting for...] firmware-lulu-6301.136.B 8811714 [lulu: update RAMID table] Additionally, some minor cleanup/changes were made: - I2C devices set to use level (vs edge) interrupt triggering - HDA verb entries use simplified macro entry format - correct FADT table header version - remove unused ACPI device entries / .asl file(s) - clean up ACPI code (e.g., trackpad on Lulu) - adjust _CID for trackpad on Lulu in order to not load non-functional Windows driver (does not affect Linux) - remove unused header includes (multiple/various) - correct I2C addresses used for SMBIOS device entries - correct misc typos etc The existing auron_paine samus boards are removed. Variant setup modeled after google/slippy Change-Id: I53436878d141715eb18b8ea5043d71e6e8728fe8 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/17917 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/google/auron/Kconfig | 65 ++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 23 deletions(-) (limited to 'src/mainboard/google/auron/Kconfig') diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index 9eda1013ec..00b4be88f7 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -1,7 +1,6 @@ -if BOARD_GOOGLE_AURON -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y +config BOARD_GOOGLE_BASEBOARD_AURON + def_bool n select SOC_INTEL_BROADWELL select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC @@ -13,6 +12,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 +if BOARD_GOOGLE_BASEBOARD_AURON + config CHROMEOS select CHROMEOS_RAMOOPS_DYNAMIC select EC_GOOGLE_CHROMEEC_SWITCHES @@ -25,13 +26,46 @@ config MAINBOARD_DIR string default google/auron +config VARIANT_DIR + string + default "auron_paine" if BOARD_GOOGLE_AURON_PAINE + default "auron_yuna" if BOARD_GOOGLE_AURON_YUNA + default "gandof" if BOARD_GOOGLE_GANDOF + default "lulu" if BOARD_GOOGLE_LULU + default "samus" if BOARD_GOOGLE_SAMUS + config MAINBOARD_PART_NUMBER string - default "Auron" + default "Auron_Paine" if BOARD_GOOGLE_AURON_PAINE + default "Auron_Yuna" if BOARD_GOOGLE_AURON_YUNA + default "Gandof" if BOARD_GOOGLE_GANDOF + default "Lulu" if BOARD_GOOGLE_LULU + default "Samus" if BOARD_GOOGLE_SAMUS -config IRQ_SLOT_COUNT - int - default 18 +config GBB_HWID + string + depends on CHROMEOS + default "PAINE TEST A-A 8843" if BOARD_GOOGLE_AURON_PAINE + default "YUNA TEST A-A 3347" if BOARD_GOOGLE_AURON_YUNA + default "GANDOF TEST A-A 7705" if BOARD_GOOGLE_GANDOF + default "LULU TEST A-A 7705" if BOARD_GOOGLE_LULU + default "SAMUS TEST 8028" if BOARD_GOOGLE_SAMUS + +config DEVICETREE + string + default "variants/auron_paine/devicetree.cb" if BOARD_GOOGLE_AURON_PAINE + default "variants/auron_yuna/devicetree.cb" if BOARD_GOOGLE_AURON_YUNA + default "variants/gandof/devicetree.cb" if BOARD_GOOGLE_GANDOF + default "variants/lulu/devicetree.cb" if BOARD_GOOGLE_LULU + default "variants/samus/devicetree.cb" if BOARD_GOOGLE_SAMUS + +config EC_GOOGLE_CHROMEEC_BOARDNAME + string + default "auron" if BOARD_GOOGLE_AURON_PAINE + default "auron" if BOARD_GOOGLE_AURON_YUNA + default "" if BOARD_GOOGLE_GANDOF + default "" if BOARD_GOOGLE_LULU + default "samus" if BOARD_GOOGLE_SAMUS config MAX_CPUS int @@ -39,7 +73,7 @@ config MAX_CPUS config VGA_BIOS_FILE string - default "pci8086,0166.rom" + default "pci8086,0406.rom" config HAVE_IFD_BIN bool @@ -49,19 +83,4 @@ config HAVE_ME_BIN bool default n - -config MAINBOARD_FAMILY - string - depends on GENERATE_SMBIOS_TABLES - default "Google_Auron" - -config EC_GOOGLE_CHROMEEC_BOARDNAME - string - default "auron" - -config GBB_HWID - string - depends on CHROMEOS - default "AURON TEST A-A 9944" - endif -- cgit v1.2.3