Alex James has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32708
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to a variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to a variant setup
The Gigabyte GA-B75M_D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-panther-point as a new common baseboard.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c D src/mainboard/gigabyte/ga-b75m-d3v/thermal.h A src/mainboard/gigabyte/ga-panther-point/Kconfig A src/mainboard/gigabyte/ga-panther-point/Kconfig.name R src/mainboard/gigabyte/ga-panther-point/Makefile.inc R src/mainboard/gigabyte/ga-panther-point/acpi/ec.asl R src/mainboard/gigabyte/ga-panther-point/acpi/mainboard.asl R src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl R src/mainboard/gigabyte/ga-panther-point/acpi/thermal.asl R src/mainboard/gigabyte/ga-panther-point/acpi_tables.c A src/mainboard/gigabyte/ga-panther-point/board_info.txt R src/mainboard/gigabyte/ga-panther-point/cmos.default R src/mainboard/gigabyte/ga-panther-point/cmos.layout R src/mainboard/gigabyte/ga-panther-point/dsdt.asl R src/mainboard/gigabyte/ga-panther-point/hda_verb.c A src/mainboard/gigabyte/ga-panther-point/mainboard.c R src/mainboard/gigabyte/ga-panther-point/thermal.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gpio.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/acpi/superio.asl C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h A src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/mainboard_init.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gpio.c C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/acpi/superio.asl R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h A src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/mainboard_init.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/romstage.c 47 files changed, 236 insertions(+), 609 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/1
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig deleted file mode 100644 index 659f47c..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig +++ /dev/null @@ -1,48 +0,0 @@ -if BOARD_GIGABYTE_GA_B75M_D3H - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select ARCH_X86 - select NORTHBRIDGE_INTEL_IVYBRIDGE - select USE_NATIVE_RAMINIT - select SOUTHBRIDGE_INTEL_C216 - select SUPERIO_ITE_IT8728F - select BOARD_ROMSIZE_KB_8192 - select HAVE_ACPI_TABLES - select HAVE_OPTION_TABLE - select HAVE_CMOS_DEFAULT - select HAVE_ACPI_RESUME - select INTEL_INT15 - select SERIRQ_CONTINUOUS_MODE - select MAINBOARD_HAS_LIBGFXINIT - select MAINBOARD_HAS_LPC_TPM - -config DRAM_RESET_GATE_GPIO - int - default 25 - -config USBDEBUG_HCD_INDEX - int - default 2 - -config MAINBOARD_DIR - string - default gigabyte/ga-b75m-d3h - -config MAINBOARD_PART_NUMBER - string - default "GA-B75M-D3H" - -config MAX_CPUS - int - default 8 - -config VGA_BIOS_ID - string - default "8086,0162" - -config VGA_BIOS_FILE - string - default "pci8086,0162.rom" - -endif # BOARD_GIGABYTE_GA_B75M_D3H diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name deleted file mode 100644 index 571f6d1..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_GIGABYTE_GA_B75M_D3H - bool "GA-B75M-D3H" diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c deleted file mode 100644 index 4e8d9f5..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * Copyright (C) 2011-2012 Google Inc. - * Copyright (C) 2014 Vladimir Serbinenko - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <device/device.h> -#include <drivers/intel/gma/int15.h> -#include <southbridge/intel/bd82x6x/pch.h> - -static void mainboard_init(struct device *dev) -{ - RCBA32(0x38c8) = 0x00002005; - RCBA32(0x38c4) = 0x00802005; - RCBA32(0x2240) = 0x00330e71; - RCBA32(0x2244) = 0x003f0eb1; - RCBA32(0x2248) = 0x002102cd; - RCBA32(0x224c) = 0x00f60000; - RCBA32(0x2250) = 0x00020000; - RCBA32(0x2254) = 0x00e3004c; - RCBA32(0x2258) = 0x00e20bef; - RCBA32(0x2260) = 0x003304ed; - RCBA32(0x2278) = 0x001107c1; - RCBA32(0x227c) = 0x001d07e9; - RCBA32(0x2280) = 0x00e20000; - RCBA32(0x2284) = 0x00ee0000; - RCBA32(0x2288) = 0x005b05d3; - RCBA32(0x2318) = 0x04b8ff2e; - RCBA32(0x231c) = 0x03930f2e; - RCBA32(0x3808) = 0x005044a3; - RCBA32(0x3810) = 0x52410000; - RCBA32(0x3814) = 0x0000008a; - RCBA32(0x3818) = 0x00000006; - RCBA32(0x381c) = 0x0000072e; - RCBA32(0x3820) = 0x0000000a; - RCBA32(0x3824) = 0x00000123; - RCBA32(0x3828) = 0x00000009; - RCBA32(0x382c) = 0x00000001; - RCBA32(0x3834) = 0x0000061a; - RCBA32(0x3838) = 0x00000003; - RCBA32(0x383c) = 0x00000a76; - RCBA32(0x3840) = 0x00000004; - RCBA32(0x3844) = 0x0000e5e4; - RCBA32(0x3848) = 0x0000000e; -} - -// mainboard_enable is executed as first thing after -// enumerate_buses(). - -static void mainboard_enable(struct device *dev) -{ - dev->ops->init = mainboard_init; - - install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_NONE, - GMA_INT15_PANEL_FIT_DEFAULT, - GMA_INT15_BOOT_DISPLAY_CRT, 0); -} - -struct chip_operations mainboard_ops = { - .enable_dev = mainboard_enable, -}; diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig deleted file mode 100644 index e01d484..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig +++ /dev/null @@ -1,47 +0,0 @@ -if BOARD_GIGABYTE_GA_B75M_D3V - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select ARCH_X86 - select NORTHBRIDGE_INTEL_IVYBRIDGE - select USE_NATIVE_RAMINIT - select SOUTHBRIDGE_INTEL_C216 - select SUPERIO_ITE_IT8728F - select BOARD_ROMSIZE_KB_8192 - select HAVE_ACPI_TABLES - select HAVE_OPTION_TABLE - select HAVE_CMOS_DEFAULT - select HAVE_ACPI_RESUME - select INTEL_INT15 - select SERIRQ_CONTINUOUS_MODE - select MAINBOARD_HAS_LIBGFXINIT - -config DRAM_RESET_GATE_GPIO - int - default 25 - -config USBDEBUG_HCD_INDEX - int - default 2 - -config MAINBOARD_DIR - string - default gigabyte/ga-b75m-d3v - -config MAINBOARD_PART_NUMBER - string - default "GA-B75M-D3V" - -config MAX_CPUS - int - default 8 - -config VGA_BIOS_ID - string - default "8086,0102" - -config VGA_BIOS_FILE - string - default "pci8086,0102.rom" - -endif # BOARD_GIGABYTE_GA_B75M_D3V diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name deleted file mode 100644 index 92f5744..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_GIGABYTE_GA_B75M_D3V - bool "GA-B75M-D3V" diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc b/src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc deleted file mode 100644 index 63976c4..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc +++ /dev/null @@ -1,17 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -romstage-y += gpio.c -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl deleted file mode 100644 index e69de29..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl +++ /dev/null diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl deleted file mode 100644 index d8d3320..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 The Chromium OS Authors. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* The _PTS method (Prepare To Sleep) is called before the OS is - * entering a sleep state. The sleep state number is passed in Arg0 - */ - -Method(_PTS,1) -{ -} - -/* The _WAK method is called on system wakeup */ - -Method(_WAK,1) -{ - Return(Package(){0,0}) -} diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl deleted file mode 100644 index 4c50b6c..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl +++ /dev/null @@ -1,4 +0,0 @@ -/* mainboard configuration */ - -#define SIO_EC_ENABLE_PS2K // Enable PS/2 Keyboard -#define SIO_ENABLE_PS2M // Enable PS/2 Mouse diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl deleted file mode 100644 index ca561a5..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl +++ /dev/null @@ -1,63 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 The Chromium OS Authors. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// Thermal Zone - -External (\PPKG, MethodObj) - -Scope (_TZ) -{ - ThermalZone (THRM) - { - Name (_TC1, 0x02) - Name (_TC2, 0x03) - - // Thermal zone polling frequency: 10 seconds - Name (_TZP, 100) - - // Thermal sampling period for passive cooling: 10 seconds - Name (_TSP, 100) - - // Convert from Degrees C to 1/10 Kelvin for ACPI - Method (CTOK, 1) - { - // 10th of Degrees C - Multiply (Arg0, 10, Local0) - - // Convert to Kelvin - Add (Local0, 2732, Local0) - - Return (Local0) - } - - // Threshold for OS to shutdown - Method (_CRT, 0, Serialized) - { - Return (CTOK (\TCRT)) - } - - // Threshold for passive cooling - Method (_PSV, 0, Serialized) - { - Return (CTOK (\TPSV)) - } - - // Processors used for passive cooling - Method (_PSL, 0, Serialized) - { - Return (\PPKG ()) - } - } -} diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c deleted file mode 100644 index 5c09059..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <string.h> -#include <southbridge/intel/bd82x6x/nvs.h> -#include "thermal.h" - -static void acpi_update_thermal_table(global_nvs_t *gnvs) -{ - gnvs->tcrt = CRITICAL_TEMPERATURE; - gnvs->tpsv = PASSIVE_TEMPERATURE; -} - -void acpi_create_gnvs(global_nvs_t *gnvs) -{ - memset((void *)gnvs, 0, sizeof(*gnvs)); - - /* Disable USB ports in S3 by default */ - gnvs->s3u0 = 0; - gnvs->s3u1 = 0; - - /* Disable USB ports in S5 by default */ - gnvs->s5u0 = 0; - gnvs->s5u1 = 0; - - acpi_update_thermal_table(gnvs); -} diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default deleted file mode 100644 index 6f3cec7..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default +++ /dev/null @@ -1,6 +0,0 @@ -boot_option=Fallback -debug_level=Debug -power_on_after_fail=Enable -nmi=Enable -sata_mode=AHCI -gfx_uma_size=32M diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout deleted file mode 100644 index 095e383..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout +++ /dev/null @@ -1,107 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## Copyright (C) 2014 Vladimir Serbinenko -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -# ----------------------------------------------------------------- -entries - -# ----------------------------------------------------------------- -# Status Register A -# ----------------------------------------------------------------- -# Status Register B -# ----------------------------------------------------------------- -# Status Register C -#96 4 r 0 status_c_rsvd -#100 1 r 0 uf_flag -#101 1 r 0 af_flag -#102 1 r 0 pf_flag -#103 1 r 0 irqf_flag -# ----------------------------------------------------------------- -# Status Register D -#104 7 r 0 status_d_rsvd -#111 1 r 0 valid_cmos_ram -# ----------------------------------------------------------------- -# Diagnostic Status Register -#112 8 r 0 diag_rsvd1 - -# ----------------------------------------------------------------- -0 120 r 0 reserved_memory -#120 264 r 0 unused - -# ----------------------------------------------------------------- -# RTC_BOOT_BYTE (coreboot hardcoded) -384 1 e 4 boot_option -388 4 h 0 reboot_counter -#390 2 r 0 unused? - -# ----------------------------------------------------------------- -# coreboot config options: console -#392 3 r 0 unused -395 4 e 6 debug_level -#399 1 r 0 unused - -# coreboot config options: southbridge -408 1 e 1 nmi -409 2 e 7 power_on_after_fail - -#411 10 r 0 unused -421 1 e 9 sata_mode -#422 2 r 0 unused - -# coreboot config options: cpu -#425 7 r 0 unused - -# coreboot config options: northbridge -432 3 e 11 gfx_uma_size -#435 549 r 0 unused - -# coreboot config options: check sums -984 16 h 0 check_sum - -# ----------------------------------------------------------------- - -enumerations - -#ID value text -1 0 Disable -1 1 Enable -4 0 Fallback -4 1 Normal -6 0 Emergency -6 1 Alert -6 2 Critical -6 3 Error -6 4 Warning -6 5 Notice -6 6 Info -6 7 Debug -6 8 Spew -7 0 Disable -7 1 Enable -7 2 Keep -9 0 AHCI -9 1 IDE -11 0 32M -11 1 64M -11 2 96M -11 3 128M -11 4 160M -11 5 192M -11 6 224M - -# ----------------------------------------------------------------- -checksums - -checksum 392 439 984 diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl b/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl deleted file mode 100644 index 67054cc..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <arch/acpi.h> -DefinitionBlock( - "dsdt.aml", - "DSDT", - 0x02, // DSDT revision: ACPI v2.0 and up - OEM_ID, - ACPI_TABLE_CREATOR, - 0x20141018 // OEM revision -) -{ - #include <southbridge/intel/bd82x6x/acpi/platform.asl> - - // Some generic macros - #include "acpi/platform.asl" - #include <cpu/intel/common/acpi/cpu.asl> - /* global NVS and variables. */ - #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <southbridge/intel/bd82x6x/acpi/sleepstates.asl> - - Scope (_SB) { - Device (PCI0) - { - #include <northbridge/intel/sandybridge/acpi/sandybridge.asl> - #include <southbridge/intel/bd82x6x/acpi/pch.asl> - #include <drivers/intel/gma/acpi/default_brightness_levels.asl> - } - } -} diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c deleted file mode 100644 index 4e8d9f5..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * Copyright (C) 2011-2012 Google Inc. - * Copyright (C) 2014 Vladimir Serbinenko - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <device/device.h> -#include <drivers/intel/gma/int15.h> -#include <southbridge/intel/bd82x6x/pch.h> - -static void mainboard_init(struct device *dev) -{ - RCBA32(0x38c8) = 0x00002005; - RCBA32(0x38c4) = 0x00802005; - RCBA32(0x2240) = 0x00330e71; - RCBA32(0x2244) = 0x003f0eb1; - RCBA32(0x2248) = 0x002102cd; - RCBA32(0x224c) = 0x00f60000; - RCBA32(0x2250) = 0x00020000; - RCBA32(0x2254) = 0x00e3004c; - RCBA32(0x2258) = 0x00e20bef; - RCBA32(0x2260) = 0x003304ed; - RCBA32(0x2278) = 0x001107c1; - RCBA32(0x227c) = 0x001d07e9; - RCBA32(0x2280) = 0x00e20000; - RCBA32(0x2284) = 0x00ee0000; - RCBA32(0x2288) = 0x005b05d3; - RCBA32(0x2318) = 0x04b8ff2e; - RCBA32(0x231c) = 0x03930f2e; - RCBA32(0x3808) = 0x005044a3; - RCBA32(0x3810) = 0x52410000; - RCBA32(0x3814) = 0x0000008a; - RCBA32(0x3818) = 0x00000006; - RCBA32(0x381c) = 0x0000072e; - RCBA32(0x3820) = 0x0000000a; - RCBA32(0x3824) = 0x00000123; - RCBA32(0x3828) = 0x00000009; - RCBA32(0x382c) = 0x00000001; - RCBA32(0x3834) = 0x0000061a; - RCBA32(0x3838) = 0x00000003; - RCBA32(0x383c) = 0x00000a76; - RCBA32(0x3840) = 0x00000004; - RCBA32(0x3844) = 0x0000e5e4; - RCBA32(0x3848) = 0x0000000e; -} - -// mainboard_enable is executed as first thing after -// enumerate_buses(). - -static void mainboard_enable(struct device *dev) -{ - dev->ops->init = mainboard_init; - - install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_NONE, - GMA_INT15_PANEL_FIT_DEFAULT, - GMA_INT15_BOOT_DISPLAY_CRT, 0); -} - -struct chip_operations mainboard_ops = { - .enable_dev = mainboard_enable, -}; diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/thermal.h b/src/mainboard/gigabyte/ga-b75m-d3v/thermal.h deleted file mode 100644 index 9db6910..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/thermal.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 The Chromium OS Authors. All rights reserved. - * Copyright (C) 2014 Vladimir Serbinenko - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef GAB75MD3H_THERMAL_H -#define GAB75MD3H_THERMAL_H - - /* Temperature which OS will shutdown at */ - #define CRITICAL_TEMPERATURE 100 - - /* Temperature which OS will throttle CPU */ - #define PASSIVE_TEMPERATURE 90 - -#endif diff --git a/src/mainboard/gigabyte/ga-panther-point/Kconfig b/src/mainboard/gigabyte/ga-panther-point/Kconfig new file mode 100644 index 0000000..583e967 --- /dev/null +++ b/src/mainboard/gigabyte/ga-panther-point/Kconfig @@ -0,0 +1,73 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2018 Angel Pons th3fanbus@gmail.com +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; version 2 of the License. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + +config BOARD_GIGABYTE_BASEBOARD_GA_PANTHER_POINT + def_bool n + select ARCH_X86 + select BOARD_ROMSIZE_KB_8192 + select HAVE_ACPI_RESUME + select HAVE_ACPI_TABLES + select INTEL_INT15 + select NORTHBRIDGE_INTEL_SANDYBRIDGE + select SERIRQ_CONTINUOUS_MODE + select SOUTHBRIDGE_INTEL_BD82X6X + select USE_NATIVE_RAMINIT + select SUPERIO_ITE_IT8728F + select MAINBOARD_HAS_LIBGFXINIT + select INTEL_GMA_HAVE_VBT + select HAVE_OPTION_TABLE + select HAVE_CMOS_DEFAULT + +if BOARD_GIGABYTE_BASEBOARD_GA_PANTHER_POINT + +config MAINBOARD_DIR + string + default "gigabyte/ga-panther-point" + +config VARIANT_DIR + string + default "ga-b75m-d3h" if BOARD_GIGABYTE_GA_B75M_D3H + default "ga-b75m-d3v" if BOARD_GIGABYTE_GA_B75M_D3V + +config MAINBOARD_PART_NUMBER + string + default "GA-B75M-D3H" if BOARD_GIGABYTE_GA_B75M_D3H + default "GA-B75M-D3V" if BOARD_GIGABYTE_GA_B75M_D3V + +config DEVICETREE + string + default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + +config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID + hex + default 0x5001 + +config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID + hex + default 0x1458 + +config MAX_CPUS + int + default 8 + +config VGA_BIOS_ID + string + default "8086,0162" + +config VGA_BIOS_FILE + string + default "pci8086,0162.rom" + +endif # BOARD_GIGABYTE_BASEBOARD_GA_PANTHER_POINT diff --git a/src/mainboard/gigabyte/ga-panther-point/Kconfig.name b/src/mainboard/gigabyte/ga-panther-point/Kconfig.name new file mode 100644 index 0000000..19216e2 --- /dev/null +++ b/src/mainboard/gigabyte/ga-panther-point/Kconfig.name @@ -0,0 +1,7 @@ +config BOARD_GIGABYTE_GA_B75M_D3H + bool "GA-B75M-D3H" + select BOARD_GIGABYTE_BASEBOARD_GA_PANTHER_POINT + +config BOARD_GIGABYTE_GA_B75M_D3V + bool "GA-B75M-D3V" + select BOARD_GIGABYTE_BASEBOARD_GA_PANTHER_POINT diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc b/src/mainboard/gigabyte/ga-panther-point/Makefile.inc similarity index 65% rename from src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc rename to src/mainboard/gigabyte/ga-panther-point/Makefile.inc index 63976c4..08a9957 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc +++ b/src/mainboard/gigabyte/ga-panther-point/Makefile.inc @@ -13,5 +13,11 @@ ## GNU General Public License for more details. ##
-romstage-y += gpio.c -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +romstage-y += variants/$(VARIANT_DIR)/gpio.c +romstage-y += variants/$(VARIANT_DIR)/romstage.c + +ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads + +subdirs-y += variants/$(VARIANT_DIR) + +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/ec.asl b/src/mainboard/gigabyte/ga-panther-point/acpi/ec.asl similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/acpi/ec.asl rename to src/mainboard/gigabyte/ga-panther-point/acpi/ec.asl diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/mainboard.asl b/src/mainboard/gigabyte/ga-panther-point/acpi/mainboard.asl similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/acpi/mainboard.asl rename to src/mainboard/gigabyte/ga-panther-point/acpi/mainboard.asl diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/platform.asl b/src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl similarity index 92% rename from src/mainboard/gigabyte/ga-b75m-d3h/acpi/platform.asl rename to src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl index 0603164..7a3e682 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/platform.asl +++ b/src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl @@ -17,14 +17,13 @@ * entering a sleep state. The sleep state number is passed in Arg0 */
-Method(_PTS,1) +Method (_PTS, 1) { - }
/* The _WAK method is called on system wakeup */
-Method(_WAK,1) +Method (_WAK, 1) { - Return(Package(){0,0}) + Return (Package () {0,0}) } diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl b/src/mainboard/gigabyte/ga-panther-point/acpi/thermal.asl similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl rename to src/mainboard/gigabyte/ga-panther-point/acpi/thermal.asl diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c b/src/mainboard/gigabyte/ga-panther-point/acpi_tables.c similarity index 93% rename from src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c rename to src/mainboard/gigabyte/ga-panther-point/acpi_tables.c index 5c09059..3009a1c 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c +++ b/src/mainboard/gigabyte/ga-panther-point/acpi_tables.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */
-#include <string.h> #include <southbridge/intel/bd82x6x/nvs.h> #include "thermal.h"
@@ -25,8 +24,6 @@
void acpi_create_gnvs(global_nvs_t *gnvs) { - memset((void *)gnvs, 0, sizeof(*gnvs)); - /* Disable USB ports in S3 by default */ gnvs->s3u0 = 0; gnvs->s3u1 = 0; diff --git a/src/mainboard/gigabyte/ga-panther-point/board_info.txt b/src/mainboard/gigabyte/ga-panther-point/board_info.txt new file mode 100644 index 0000000..0116ddb --- /dev/null +++ b/src/mainboard/gigabyte/ga-panther-point/board_info.txt @@ -0,0 +1,6 @@ +Category: desktop +Board name: Gigabyte Panther Point (7 series) baseboard +ROM package: SOIC-8 +ROM protocol: SPI +ROM socketed: n +Flashrom support: y diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default b/src/mainboard/gigabyte/ga-panther-point/cmos.default similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/cmos.default rename to src/mainboard/gigabyte/ga-panther-point/cmos.default diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout b/src/mainboard/gigabyte/ga-panther-point/cmos.layout similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout rename to src/mainboard/gigabyte/ga-panther-point/cmos.layout diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl b/src/mainboard/gigabyte/ga-panther-point/dsdt.asl similarity index 85% rename from src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl rename to src/mainboard/gigabyte/ga-panther-point/dsdt.asl index 67054cc..d7590c1 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl +++ b/src/mainboard/gigabyte/ga-panther-point/dsdt.asl @@ -1,6 +1,8 @@ /* * This file is part of the coreboot project. * + * Copyright (C) 2018 Angel Pons th3fanbus@gmail.com + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. @@ -21,12 +23,15 @@ 0x20141018 // OEM revision ) { + // Some generic macros + #include "acpi/mainboard.asl" + #include "acpi/platform.asl" + #include <variant/acpi/superio.asl> + #include "acpi/thermal.asl" + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl>
- // Some generic macros - #include "acpi/platform.asl" - #include <cpu/intel/common/acpi/cpu.asl> - /* global NVS and variables. */ + /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> #include <southbridge/intel/bd82x6x/acpi/sleepstates.asl>
@@ -34,8 +39,8 @@ Device (PCI0) { #include <northbridge/intel/sandybridge/acpi/sandybridge.asl> - #include <southbridge/intel/bd82x6x/acpi/pch.asl> #include <drivers/intel/gma/acpi/default_brightness_levels.asl> + #include <southbridge/intel/bd82x6x/acpi/pch.asl> } } } diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c b/src/mainboard/gigabyte/ga-panther-point/hda_verb.c similarity index 88% rename from src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c rename to src/mainboard/gigabyte/ga-panther-point/hda_verb.c index 23cd570..34610f0 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c +++ b/src/mainboard/gigabyte/ga-panther-point/hda_verb.c @@ -13,9 +13,7 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - /* FIXME: Add configuration for sound */ -}; +#include <variant/hda_verb.h>
const u32 pc_beep_verbs[] = {};
diff --git a/src/mainboard/gigabyte/ga-panther-point/mainboard.c b/src/mainboard/gigabyte/ga-panther-point/mainboard.c new file mode 100644 index 0000000..a7cad83 --- /dev/null +++ b/src/mainboard/gigabyte/ga-panther-point/mainboard.c @@ -0,0 +1,33 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2018 Angel Pons th3fanbus@gmail.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <device/device.h> +#include <drivers/intel/gma/int15.h> +#include <southbridge/intel/bd82x6x/pch.h> + +#include <variant/mainboard_init.h> + +static void mainboard_enable(struct device *dev) +{ + dev->ops->init = mainboard_init; + + install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_NONE, + GMA_INT15_PANEL_FIT_DEFAULT, + GMA_INT15_BOOT_DISPLAY_DEFAULT, 0); +} + +struct chip_operations mainboard_ops = { + .enable_dev = mainboard_enable, +}; diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/thermal.h b/src/mainboard/gigabyte/ga-panther-point/thermal.h similarity index 73% rename from src/mainboard/gigabyte/ga-b75m-d3h/thermal.h rename to src/mainboard/gigabyte/ga-panther-point/thermal.h index 9db6910..87c420b 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/thermal.h +++ b/src/mainboard/gigabyte/ga-panther-point/thermal.h @@ -14,13 +14,13 @@ * GNU General Public License for more details. */
-#ifndef GAB75MD3H_THERMAL_H -#define GAB75MD3H_THERMAL_H +#ifndef GA_PANTHER_POINT_THERMAL_H +#define GA_PANTHER_POINT_THERMAL_H
- /* Temperature which OS will shutdown at */ - #define CRITICAL_TEMPERATURE 100 +/* Temperature which OS will shutdown at */ +#define CRITICAL_TEMPERATURE 100
- /* Temperature which OS will throttle CPU */ - #define PASSIVE_TEMPERATURE 90 +/* Temperature which OS will throttle CPU */ +#define PASSIVE_TEMPERATURE 90
#endif diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/board_info.txt b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/board_info.txt similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/board_info.txt rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/board_info.txt diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/devicetree.cb similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/devicetree.cb diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/gma-mainboard.ads b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gma-mainboard.ads similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/gma-mainboard.ads rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gma-mainboard.ads diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/gpio.c b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gpio.c similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/gpio.c rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gpio.c diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/superio.asl b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/acpi/superio.asl similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/acpi/superio.asl rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/acpi/superio.asl diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h similarity index 86% copy from src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c copy to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h index 23cd570..fdc86d3 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c +++ b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h @@ -1,3 +1,6 @@ +#ifndef GA_B75M_D3H_HDA_VERB_H +#define GA_B75M_D3H_HDA_VERB_H + /* * This file is part of the coreboot project. * @@ -11,12 +14,8 @@ * GNU General Public License for more details. */
-#include <device/azalia_device.h> - const u32 cim_verb_data[] = { /* FIXME: Add configuration for sound */ };
-const u32 pc_beep_verbs[] = {}; - -AZALIA_ARRAY_SIZES; +#endif diff --git a/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/mainboard_init.h b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/mainboard_init.h new file mode 100644 index 0000000..d1fa56a --- /dev/null +++ b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/mainboard_init.h @@ -0,0 +1,40 @@ +#ifndef GA_B75M_D3H_MAINBOARD_INIT_H +#define GA_B75M_D3H_MAINBOARD_INIT_H + +static void mainboard_init(struct device *dev) +{ + RCBA32(0x38c8) = 0x00002005; + RCBA32(0x38c4) = 0x00802005; + RCBA32(0x2240) = 0x00330e71; + RCBA32(0x2244) = 0x003f0eb1; + RCBA32(0x2248) = 0x002102cd; + RCBA32(0x224c) = 0x00f60000; + RCBA32(0x2250) = 0x00020000; + RCBA32(0x2254) = 0x00e3004c; + RCBA32(0x2258) = 0x00e20bef; + RCBA32(0x2260) = 0x003304ed; + RCBA32(0x2278) = 0x001107c1; + RCBA32(0x227c) = 0x001d07e9; + RCBA32(0x2280) = 0x00e20000; + RCBA32(0x2284) = 0x00ee0000; + RCBA32(0x2288) = 0x005b05d3; + RCBA32(0x2318) = 0x04b8ff2e; + RCBA32(0x231c) = 0x03930f2e; + RCBA32(0x3808) = 0x005044a3; + RCBA32(0x3810) = 0x52410000; + RCBA32(0x3814) = 0x0000008a; + RCBA32(0x3818) = 0x00000006; + RCBA32(0x381c) = 0x0000072e; + RCBA32(0x3820) = 0x0000000a; + RCBA32(0x3824) = 0x00000123; + RCBA32(0x3828) = 0x00000009; + RCBA32(0x382c) = 0x00000001; + RCBA32(0x3834) = 0x0000061a; + RCBA32(0x3838) = 0x00000003; + RCBA32(0x383c) = 0x00000a76; + RCBA32(0x3840) = 0x00000004; + RCBA32(0x3844) = 0x0000e5e4; + RCBA32(0x3848) = 0x0000000e; +} + +#endif diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/romstage.c similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/romstage.c rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/romstage.c diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/board_info.txt b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt similarity index 89% rename from src/mainboard/gigabyte/ga-b75m-d3v/board_info.txt rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt index ede1945..5c78691 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/board_info.txt +++ b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt @@ -4,4 +4,4 @@ ROM protocol: SPI ROM socketed: n Flashrom support: y -Release date: 2012 +Release year: 2012 diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/devicetree.cb similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/devicetree.cb diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/gma-mainboard.ads b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gma-mainboard.ads similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3v/gma-mainboard.ads rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gma-mainboard.ads diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/gpio.c b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gpio.c similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3v/gpio.c rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gpio.c diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/superio.asl b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/acpi/superio.asl similarity index 100% copy from src/mainboard/gigabyte/ga-b75m-d3h/acpi/superio.asl copy to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/acpi/superio.asl diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/hda_verb.c b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h similarity index 92% rename from src/mainboard/gigabyte/ga-b75m-d3v/hda_verb.c rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h index 3ae6b5d..120e347 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/hda_verb.c +++ b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h @@ -1,3 +1,6 @@ +#ifndef GA_B75M_D3V_HDA_VERB_H +#define GA_B75M_D3V_HDA_VERB_H + /* * This file is part of the coreboot project. * @@ -11,8 +14,6 @@ * GNU General Public License for more details. */
-#include <device/azalia_device.h> - const u32 cim_verb_data[] = { /* coreboot specific header */ 0x10ec0887, // Realtek 887 @@ -36,6 +37,4 @@ AZALIA_PIN_CFG(0, 0x1f, 0x411111f0) };
-const u32 pc_beep_verbs[] = {}; - -AZALIA_ARRAY_SIZES; +#endif diff --git a/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/mainboard_init.h b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/mainboard_init.h new file mode 100644 index 0000000..7f10282 --- /dev/null +++ b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/mainboard_init.h @@ -0,0 +1,40 @@ +#ifndef GA_B75M_D3V_MAINBOARD_INIT_H +#define GA_B75M_D3V_MAINBOARD_INIT_H + +static void mainboard_init(struct device *dev) +{ + RCBA32(0x38c8) = 0x00002005; + RCBA32(0x38c4) = 0x00802005; + RCBA32(0x2240) = 0x00330e71; + RCBA32(0x2244) = 0x003f0eb1; + RCBA32(0x2248) = 0x002102cd; + RCBA32(0x224c) = 0x00f60000; + RCBA32(0x2250) = 0x00020000; + RCBA32(0x2254) = 0x00e3004c; + RCBA32(0x2258) = 0x00e20bef; + RCBA32(0x2260) = 0x003304ed; + RCBA32(0x2278) = 0x001107c1; + RCBA32(0x227c) = 0x001d07e9; + RCBA32(0x2280) = 0x00e20000; + RCBA32(0x2284) = 0x00ee0000; + RCBA32(0x2288) = 0x005b05d3; + RCBA32(0x2318) = 0x04b8ff2e; + RCBA32(0x231c) = 0x03930f2e; + RCBA32(0x3808) = 0x005044a3; + RCBA32(0x3810) = 0x52410000; + RCBA32(0x3814) = 0x0000008a; + RCBA32(0x3818) = 0x00000006; + RCBA32(0x381c) = 0x0000072e; + RCBA32(0x3820) = 0x0000000a; + RCBA32(0x3824) = 0x00000123; + RCBA32(0x3828) = 0x00000009; + RCBA32(0x382c) = 0x00000001; + RCBA32(0x3834) = 0x0000061a; + RCBA32(0x3838) = 0x00000003; + RCBA32(0x383c) = 0x00000a76; + RCBA32(0x3840) = 0x00000004; + RCBA32(0x3844) = 0x0000e5e4; + RCBA32(0x3848) = 0x0000000e; +} + +#endif diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c b/src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/romstage.c similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3v/romstage.c rename to src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/romstage.c
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to a variant setup ......................................................................
Patch Set 1:
(64 comments)
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... File src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/mainboard_init.h:
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 6: RCBA32(0x38c8) = 0x00002005; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 7: RCBA32(0x38c4) = 0x00802005; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 8: RCBA32(0x2240) = 0x00330e71; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 9: RCBA32(0x2244) = 0x003f0eb1; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 10: RCBA32(0x2248) = 0x002102cd; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 11: RCBA32(0x224c) = 0x00f60000; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 12: RCBA32(0x2250) = 0x00020000; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 13: RCBA32(0x2254) = 0x00e3004c; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 14: RCBA32(0x2258) = 0x00e20bef; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 15: RCBA32(0x2260) = 0x003304ed; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 16: RCBA32(0x2278) = 0x001107c1; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 17: RCBA32(0x227c) = 0x001d07e9; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 18: RCBA32(0x2280) = 0x00e20000; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 19: RCBA32(0x2284) = 0x00ee0000; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 20: RCBA32(0x2288) = 0x005b05d3; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 21: RCBA32(0x2318) = 0x04b8ff2e; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 22: RCBA32(0x231c) = 0x03930f2e; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 23: RCBA32(0x3808) = 0x005044a3; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 24: RCBA32(0x3810) = 0x52410000; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 25: RCBA32(0x3814) = 0x0000008a; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 26: RCBA32(0x3818) = 0x00000006; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 27: RCBA32(0x381c) = 0x0000072e; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 28: RCBA32(0x3820) = 0x0000000a; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 29: RCBA32(0x3824) = 0x00000123; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 30: RCBA32(0x3828) = 0x00000009; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 31: RCBA32(0x382c) = 0x00000001; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 32: RCBA32(0x3834) = 0x0000061a; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 33: RCBA32(0x3838) = 0x00000003; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 34: RCBA32(0x383c) = 0x00000a76; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 35: RCBA32(0x3840) = 0x00000004; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 36: RCBA32(0x3844) = 0x0000e5e4; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 37: RCBA32(0x3848) = 0x0000000e; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... File src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/mainboard_init.h:
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 6: RCBA32(0x38c8) = 0x00002005; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 7: RCBA32(0x38c4) = 0x00802005; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 8: RCBA32(0x2240) = 0x00330e71; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 9: RCBA32(0x2244) = 0x003f0eb1; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 10: RCBA32(0x2248) = 0x002102cd; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 11: RCBA32(0x224c) = 0x00f60000; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 12: RCBA32(0x2250) = 0x00020000; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 13: RCBA32(0x2254) = 0x00e3004c; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 14: RCBA32(0x2258) = 0x00e20bef; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 15: RCBA32(0x2260) = 0x003304ed; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 16: RCBA32(0x2278) = 0x001107c1; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 17: RCBA32(0x227c) = 0x001d07e9; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 18: RCBA32(0x2280) = 0x00e20000; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 19: RCBA32(0x2284) = 0x00ee0000; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 20: RCBA32(0x2288) = 0x005b05d3; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 21: RCBA32(0x2318) = 0x04b8ff2e; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 22: RCBA32(0x231c) = 0x03930f2e; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 23: RCBA32(0x3808) = 0x005044a3; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 24: RCBA32(0x3810) = 0x52410000; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 25: RCBA32(0x3814) = 0x0000008a; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 26: RCBA32(0x3818) = 0x00000006; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 27: RCBA32(0x381c) = 0x0000072e; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 28: RCBA32(0x3820) = 0x0000000a; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 29: RCBA32(0x3824) = 0x00000123; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 30: RCBA32(0x3828) = 0x00000009; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 31: RCBA32(0x382c) = 0x00000001; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 32: RCBA32(0x3834) = 0x0000061a; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 33: RCBA32(0x3838) = 0x00000003; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 34: RCBA32(0x383c) = 0x00000a76; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 35: RCBA32(0x3840) = 0x00000004; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 36: RCBA32(0x3844) = 0x0000e5e4; please, no spaces at the start of a line
https://review.coreboot.org/#/c/32708/1/src/mainboard/gigabyte/ga-panther-po... PS1, Line 37: RCBA32(0x3848) = 0x0000000e; please, no spaces at the start of a line
Hello Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#2).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to a variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to a variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-panther-point as a new common baseboard.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c D src/mainboard/gigabyte/ga-b75m-d3v/thermal.h A src/mainboard/gigabyte/ga-panther-point/Kconfig A src/mainboard/gigabyte/ga-panther-point/Kconfig.name R src/mainboard/gigabyte/ga-panther-point/Makefile.inc R src/mainboard/gigabyte/ga-panther-point/acpi/ec.asl R src/mainboard/gigabyte/ga-panther-point/acpi/mainboard.asl R src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl R src/mainboard/gigabyte/ga-panther-point/acpi/thermal.asl R src/mainboard/gigabyte/ga-panther-point/acpi_tables.c A src/mainboard/gigabyte/ga-panther-point/board_info.txt R src/mainboard/gigabyte/ga-panther-point/cmos.default R src/mainboard/gigabyte/ga-panther-point/cmos.layout R src/mainboard/gigabyte/ga-panther-point/dsdt.asl R src/mainboard/gigabyte/ga-panther-point/hda_verb.c A src/mainboard/gigabyte/ga-panther-point/mainboard.c R src/mainboard/gigabyte/ga-panther-point/thermal.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gpio.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/acpi/superio.asl C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h A src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/mainboard_init.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gpio.c C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/acpi/superio.asl R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h A src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/mainboard_init.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/romstage.c 47 files changed, 236 insertions(+), 609 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/2
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#3).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to a variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to a variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-panther-point as a new common baseboard.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c D src/mainboard/gigabyte/ga-b75m-d3v/thermal.h A src/mainboard/gigabyte/ga-panther-point/Kconfig A src/mainboard/gigabyte/ga-panther-point/Kconfig.name R src/mainboard/gigabyte/ga-panther-point/Makefile.inc R src/mainboard/gigabyte/ga-panther-point/acpi/ec.asl R src/mainboard/gigabyte/ga-panther-point/acpi/mainboard.asl R src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl R src/mainboard/gigabyte/ga-panther-point/acpi/thermal.asl R src/mainboard/gigabyte/ga-panther-point/acpi_tables.c A src/mainboard/gigabyte/ga-panther-point/board_info.txt R src/mainboard/gigabyte/ga-panther-point/cmos.default R src/mainboard/gigabyte/ga-panther-point/cmos.layout R src/mainboard/gigabyte/ga-panther-point/dsdt.asl R src/mainboard/gigabyte/ga-panther-point/hda_verb.c A src/mainboard/gigabyte/ga-panther-point/mainboard.c R src/mainboard/gigabyte/ga-panther-point/thermal.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gpio.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/acpi/superio.asl C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h A src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/mainboard_init.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gpio.c C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/acpi/superio.asl R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h A src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/mainboard_init.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/romstage.c 47 files changed, 236 insertions(+), 609 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/3
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#4).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to a variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to a variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-panther-point as a new common baseboard.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c D src/mainboard/gigabyte/ga-b75m-d3v/thermal.h A src/mainboard/gigabyte/ga-panther-point/Kconfig A src/mainboard/gigabyte/ga-panther-point/Kconfig.name R src/mainboard/gigabyte/ga-panther-point/Makefile.inc R src/mainboard/gigabyte/ga-panther-point/acpi/ec.asl R src/mainboard/gigabyte/ga-panther-point/acpi/mainboard.asl R src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl R src/mainboard/gigabyte/ga-panther-point/acpi/thermal.asl R src/mainboard/gigabyte/ga-panther-point/acpi_tables.c A src/mainboard/gigabyte/ga-panther-point/board_info.txt R src/mainboard/gigabyte/ga-panther-point/cmos.default R src/mainboard/gigabyte/ga-panther-point/cmos.layout R src/mainboard/gigabyte/ga-panther-point/dsdt.asl R src/mainboard/gigabyte/ga-panther-point/hda_verb.c A src/mainboard/gigabyte/ga-panther-point/mainboard.c R src/mainboard/gigabyte/ga-panther-point/thermal.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gpio.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/acpi/superio.asl C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/mainboard_init.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gpio.c C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/acpi/superio.asl R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/mainboard_init.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/romstage.c 46 files changed, 164 insertions(+), 583 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/4
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to a variant setup ......................................................................
Patch Set 4:
(7 comments)
https://review.coreboot.org/#/c/32708/4/src/mainboard/gigabyte/ga-panther-po... File src/mainboard/gigabyte/ga-panther-point/Kconfig:
https://review.coreboot.org/#/c/32708/4/src/mainboard/gigabyte/ga-panther-po... PS4, Line 18: select ARCH_X86 : select BOARD_ROMSIZE_KB_8192 : select HAVE_ACPI_RESUME : select HAVE_ACPI_TABLES : select INTEL_INT15 : select NORTHBRIDGE_INTEL_SANDYBRIDGE : select SERIRQ_CONTINUOUS_MODE : select SOUTHBRIDGE_INTEL_BD82X6X : select USE_NATIVE_RAMINIT : select SUPERIO_ITE_IT8728F : select MAINBOARD_HAS_LIBGFXINIT : select INTEL_GMA_HAVE_VBT : select HAVE_OPTION_TABLE : select HAVE_CMOS_DEFAULT : Doesn't look like the original selection and is causing the build failure.
https://review.coreboot.org/#/c/32708/4/src/mainboard/gigabyte/ga-panther-po... PS4, Line 65: onfig VGA_BIOS_ID : string : default "8086,0162" : : config VGA_BIOS_FILE : string : default "pci8086,0162.rom" : The depends on the CPU put into the socket, and I guess we can't predict that.
https://review.coreboot.org/#/c/32708/4/src/mainboard/gigabyte/ga-panther-po... File src/mainboard/gigabyte/ga-panther-point/dsdt.asl:
PS4: Changes here seem unrelated to the variant setup?
https://review.coreboot.org/#/c/32708/4/src/mainboard/gigabyte/ga-panther-po... File src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/acpi/superio.asl:
PS4: Still the same file for both boards. And...
https://review.coreboot.org/#/c/32708/4/src/mainboard/gigabyte/ga-panther-po... PS4, Line 19: #define SIO_ENABLE_PS2M // Enable PS/2 Mouse ...it seems these definitions are meaningless for the selected chip drivers. Maybe stub the whole file out in a follow-up commit.
https://review.coreboot.org/#/c/32708/4/src/mainboard/gigabyte/ga-panther-po... File src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h:
https://review.coreboot.org/#/c/32708/4/src/mainboard/gigabyte/ga-panther-po... PS4, Line 3: Belongs below the license header.
https://review.coreboot.org/#/c/32708/4/src/mainboard/gigabyte/ga-panther-po... File src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/mainboard_init.h:
PS4: No code in .h files, please. You can add it as `ga-b75m-d3h/mainboard.c` and hook it up in the `Makefile.inc`.
NB. These registers should already be set by southbridge code.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to a variant setup ......................................................................
Patch Set 4:
Thanks for the consolidation, btw. It shows how much boiler- plate still exists for these boards.
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#5).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-panther-point as a new common baseboard.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/thermal.h A src/mainboard/gigabyte/ga-panther-point/Kconfig A src/mainboard/gigabyte/ga-panther-point/Kconfig.name R src/mainboard/gigabyte/ga-panther-point/Makefile.inc R src/mainboard/gigabyte/ga-panther-point/acpi/ec.asl R src/mainboard/gigabyte/ga-panther-point/acpi/mainboard.asl R src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl R src/mainboard/gigabyte/ga-panther-point/acpi/superio.asl R src/mainboard/gigabyte/ga-panther-point/acpi/thermal.asl R src/mainboard/gigabyte/ga-panther-point/acpi_tables.c A src/mainboard/gigabyte/ga-panther-point/board_info.txt R src/mainboard/gigabyte/ga-panther-point/cmos.default R src/mainboard/gigabyte/ga-panther-point/cmos.layout R src/mainboard/gigabyte/ga-panther-point/dsdt.asl R src/mainboard/gigabyte/ga-panther-point/hda_verb.c R src/mainboard/gigabyte/ga-panther-point/thermal.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gpio.c C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/mainboard.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gpio.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/mainboard.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/romstage.c 43 files changed, 110 insertions(+), 455 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/5
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/#/c/32708/5/src/mainboard/gigabyte/ga-panther-po... File src/mainboard/gigabyte/ga-panther-point/Kconfig:
https://review.coreboot.org/#/c/32708/5/src/mainboard/gigabyte/ga-panther-po... PS5, Line 29: select MAINBOARD_HAS_LPC_TPM Append `if BOARD_GIGABYTE_GA_B75M_D3H` as the other doesn't have it.
Alex James has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 5:
Patch Set 5:
(1 comment)
I don't think either of these boards (or any 7 series Gigabyte board in general) shipped with the TPM included. There is a TPM header on the board, though. Should we keep this enabled for boards with header?
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 5:
I don't think either of these boards (or any 7 series Gigabyte board in general) shipped with the TPM included. There is a TPM header on the board, though. Should we keep this enabled for boards with header?
Then you'd also need the respective devicetree entry. I would prefer to have as little changes as possible in this commit, though, to keep it reviewable. You can still align the boards further in follow-up commits.
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#6).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-panther-point as a new common baseboard.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/thermal.h A src/mainboard/gigabyte/ga-panther-point/Kconfig A src/mainboard/gigabyte/ga-panther-point/Kconfig.name R src/mainboard/gigabyte/ga-panther-point/Makefile.inc R src/mainboard/gigabyte/ga-panther-point/acpi/ec.asl R src/mainboard/gigabyte/ga-panther-point/acpi/mainboard.asl R src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl R src/mainboard/gigabyte/ga-panther-point/acpi/superio.asl R src/mainboard/gigabyte/ga-panther-point/acpi/thermal.asl R src/mainboard/gigabyte/ga-panther-point/acpi_tables.c A src/mainboard/gigabyte/ga-panther-point/board_info.txt R src/mainboard/gigabyte/ga-panther-point/cmos.default R src/mainboard/gigabyte/ga-panther-point/cmos.layout R src/mainboard/gigabyte/ga-panther-point/dsdt.asl R src/mainboard/gigabyte/ga-panther-point/hda_verb.c R src/mainboard/gigabyte/ga-panther-point/thermal.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gpio.c C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/mainboard.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gpio.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/mainboard.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/romstage.c 43 files changed, 110 insertions(+), 455 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/6
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 6: Code-Review+2
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/#/c/32708/6/src/mainboard/gigabyte/ga-panther-po... File src/mainboard/gigabyte/ga-panther-point/Kconfig:
https://review.coreboot.org/#/c/32708/6/src/mainboard/gigabyte/ga-panther-po... PS6, Line 47: config DEVICETREE : string : default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" The only difference between the two devicetree's is the TPM. I'd suggest using overridetrees to minimize the boilerplate.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/#/c/32708/6/src/mainboard/gigabyte/ga-panther-po... File src/mainboard/gigabyte/ga-panther-point/Kconfig:
https://review.coreboot.org/#/c/32708/6/src/mainboard/gigabyte/ga-panther-po... PS6, Line 47: config DEVICETREE : string : default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
The only difference between the two devicetree's is the TPM. […]
I realized that too by now and wonder what differs on these boards at all. We could join the devicetrees once the TPM is added to D3V. And then use overrides for future boards.
Hello build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#7).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-panther-point as a new common baseboard.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/thermal.h A src/mainboard/gigabyte/ga-panther-point/Kconfig A src/mainboard/gigabyte/ga-panther-point/Kconfig.name R src/mainboard/gigabyte/ga-panther-point/Makefile.inc R src/mainboard/gigabyte/ga-panther-point/acpi/ec.asl R src/mainboard/gigabyte/ga-panther-point/acpi/mainboard.asl R src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl R src/mainboard/gigabyte/ga-panther-point/acpi/superio.asl R src/mainboard/gigabyte/ga-panther-point/acpi/thermal.asl R src/mainboard/gigabyte/ga-panther-point/acpi_tables.c A src/mainboard/gigabyte/ga-panther-point/board_info.txt R src/mainboard/gigabyte/ga-panther-point/cmos.default R src/mainboard/gigabyte/ga-panther-point/cmos.layout R src/mainboard/gigabyte/ga-panther-point/dsdt.asl R src/mainboard/gigabyte/ga-panther-point/hda_verb.c R src/mainboard/gigabyte/ga-panther-point/thermal.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gpio.c C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/mainboard.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gpio.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/mainboard.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/romstage.c 43 files changed, 110 insertions(+), 455 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/7
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 7:
IMHO I find it very hard to track how files have changed (diffs) when joining the two boards because of the new mainboard name. Plus, I don't think it makes sense to refer to "baseboard" when referring to boards with retrofit coreboot. In any case, I'll try to review this change.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 7: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 7: Code-Review-1
(2 comments)
I would like to see overridetrees instead of two full devicetrees.
https://review.coreboot.org/#/c/32708/7/src/mainboard/gigabyte/ga-panther-po... File src/mainboard/gigabyte/ga-panther-point/Kconfig:
https://review.coreboot.org/#/c/32708/7/src/mainboard/gigabyte/ga-panther-po... PS7, Line 51: config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID : hex : default 0x5001 : : config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID : hex : default 0x1458 AFAIK these are unused and could be dropped.
They also do not seem to be on the original Kconfig files for either board. Since the diff does not show them side-by-side, I almost missed this.
https://review.coreboot.org/#/c/32708/7/src/mainboard/gigabyte/ga-panther-po... PS7, Line 63: config VGA_BIOS_ID : string : default "8086,0162" : : config VGA_BIOS_FILE : string : default "pci8086,0162.rom" Setting these values on a socketed board does not make sense and they should be dropped. The iGPU is in the CPU and it is not predictable.
Hello Angel Pons, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#8).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-panther-point as a new common baseboard.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/thermal.h A src/mainboard/gigabyte/ga-panther-point/Kconfig A src/mainboard/gigabyte/ga-panther-point/Kconfig.name R src/mainboard/gigabyte/ga-panther-point/Makefile.inc R src/mainboard/gigabyte/ga-panther-point/acpi/ec.asl R src/mainboard/gigabyte/ga-panther-point/acpi/mainboard.asl R src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl R src/mainboard/gigabyte/ga-panther-point/acpi/superio.asl R src/mainboard/gigabyte/ga-panther-point/acpi/thermal.asl R src/mainboard/gigabyte/ga-panther-point/acpi_tables.c A src/mainboard/gigabyte/ga-panther-point/board_info.txt R src/mainboard/gigabyte/ga-panther-point/cmos.default R src/mainboard/gigabyte/ga-panther-point/cmos.layout R src/mainboard/gigabyte/ga-panther-point/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/dsdt.asl R src/mainboard/gigabyte/ga-panther-point/hda_verb.c R src/mainboard/gigabyte/ga-panther-point/thermal.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gpio.c C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/mainboard.c A src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/overridetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gpio.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/mainboard.c A src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/overridetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/romstage.c 45 files changed, 125 insertions(+), 580 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/8
Hello Angel Pons, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#9).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-panther-point as a new common baseboard.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig D src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/thermal.h A src/mainboard/gigabyte/ga-panther-point/Kconfig A src/mainboard/gigabyte/ga-panther-point/Kconfig.name R src/mainboard/gigabyte/ga-panther-point/Makefile.inc R src/mainboard/gigabyte/ga-panther-point/acpi/ec.asl R src/mainboard/gigabyte/ga-panther-point/acpi/mainboard.asl R src/mainboard/gigabyte/ga-panther-point/acpi/platform.asl R src/mainboard/gigabyte/ga-panther-point/acpi/superio.asl R src/mainboard/gigabyte/ga-panther-point/acpi/thermal.asl R src/mainboard/gigabyte/ga-panther-point/acpi_tables.c A src/mainboard/gigabyte/ga-panther-point/board_info.txt R src/mainboard/gigabyte/ga-panther-point/cmos.default R src/mainboard/gigabyte/ga-panther-point/cmos.layout R src/mainboard/gigabyte/ga-panther-point/devicetree.cb R src/mainboard/gigabyte/ga-panther-point/dsdt.asl R src/mainboard/gigabyte/ga-panther-point/hda_verb.c R src/mainboard/gigabyte/ga-panther-point/thermal.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/gpio.c C src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/mainboard.c A src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/overridetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/gpio.c R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/mainboard.c A src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/overridetree.cb R src/mainboard/gigabyte/ga-panther-point/variants/ga-b75m-d3v/romstage.c 45 files changed, 117 insertions(+), 580 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/9
Hello Angel Pons, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#11).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-b75m-d3v as a variant of ga-b75m-d3h.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name M src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc M src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/data.vbt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/data.vbt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/romstage.c D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/mainboard.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c 29 files changed, 28 insertions(+), 548 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/11
Hello Angel Pons, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#12).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-b75m-d3v as a variant of ga-b75m-d3h.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name M src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc M src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/data.vbt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/data.vbt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/romstage.c D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/mainboard.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c 29 files changed, 28 insertions(+), 549 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/12
Hello Angel Pons, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#13).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-b75m-d3v as a variant of ga-b75m-d3h.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name M src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc M src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/data.vbt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/data.vbt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/romstage.c D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/mainboard.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c 29 files changed, 28 insertions(+), 549 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/13
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 13: Code-Review+1
(1 comment)
The data.vbt files are the same, maybe they don't need to be duplicated?
https://review.coreboot.org/#/c/32708/13/src/mainboard/gigabyte/ga-b75m-d3h/... File src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/romstage.c:
https://review.coreboot.org/#/c/32708/13/src/mainboard/gigabyte/ga-b75m-d3h/... PS13, Line 91: /* FIXME: This board only has two DIMM slots! */ This is the only line that differs between both romstage.c files, the rest are the same.
Hello Angel Pons, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#14).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-b75m-d3v as a variant of ga-b75m-d3h.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name M src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc M src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c M src/mainboard/gigabyte/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/include/variant/hda_verb.h D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/mainboard.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/data.vbt D src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c D src/mainboard/gigabyte/ga-b75m-d3v/romstage.c 28 files changed, 41 insertions(+), 654 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/14
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 14:
(1 comment)
https://review.coreboot.org/#/c/32708/14/src/mainboard/gigabyte/ga-b75m-d3h/... File src/mainboard/gigabyte/ga-b75m-d3h/Kconfig:
https://review.coreboot.org/#/c/32708/14/src/mainboard/gigabyte/ga-b75m-d3h/... PS14, Line 43: config ROMSTAGE_C : string : default "romstage.c" Why is this needed? mainbaord/romstage.c is included from arch/x86/Makefile.inc
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 14:
(2 comments)
https://review.coreboot.org/#/c/32708/14/src/mainboard/gigabyte/ga-b75m-d3h/... File src/mainboard/gigabyte/ga-b75m-d3h/Kconfig:
https://review.coreboot.org/#/c/32708/14/src/mainboard/gigabyte/ga-b75m-d3h/... PS14, Line 43: config ROMSTAGE_C : string : default "romstage.c"
Why is this needed? mainbaord/romstage.c is included from arch/x86/Makefile. […]
This looks familiar... It's the GPIO_C thing on asus/p5qc, but renamed to ROMSTAGE_C. There's several differences between gpio.c and romstage.c that make this Kconfig value unnecessary for romstage.c:
gpio.c files are usually meant to be used for a single board variant, so on variants there isn't a mainboard-level gpio.c in most cases. The mainboard Makefile.inc needs to explicitly include them (other platforms might use something different).
romstage.c files, however, are more generic. If anything variant-specific is needed, it can be moved into variant/*/romstage.c, so that the mainboard-level romstage.c can still be the same for all the variants. Conditional code that depends on Kconfig symbols could also be used. The mainboard-level romstage.c is automatically built if it exists, but the variant-specific romstage.c files need to be explicitly included (not everyone needs variants).
In the asus/p5qc case, two variants used the same gpio.c file, placed at the mainboard level (which is unusual). When p5ql_pro, which uses a different gpio.c, was added into the mix, something had to be done. Duplicating the shared gpio.c isn't an option, so the silly GPIO_C Kconfig symbol was the least evil kludge I could think of. (Yes, I wrote such an ugly thing)
TL;DR in this case, and for now, no variant romstage.c is needed. The ugly GPIO_C-like kludge in asus/p5qc isn't needed here either.
https://review.coreboot.org/#/c/32708/14/src/mainboard/gigabyte/ga-b75m-d3h/... File src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc:
https://review.coreboot.org/#/c/32708/14/src/mainboard/gigabyte/ga-b75m-d3h/... PS14, Line 19: romstage-y += $(CONFIG_ROMSTAGE_C) This, plus the strip call above, aren't needed. See the comments on Kconfig.
Hello Angel Pons, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32708
to look at the new patch set (#15).
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-b75m-d3v as a variant of ga-b75m-d3h.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 --- M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name M src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc M src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c M src/mainboard/gigabyte/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/include/variant/hda_verb.h D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/mainboard.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/data.vbt D src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c D src/mainboard/gigabyte/ga-b75m-d3v/romstage.c 28 files changed, 34 insertions(+), 654 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/32708/15
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
Patch Set 15: Code-Review+2
Looks good to me, looking forward to seeing your board port added
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32708 )
Change subject: mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup ......................................................................
mb/gigabyte/ga-b75m-d3{h,v}: Switch to variant setup
The Gigabyte GA-B75M-D3H/D3V mainboard trees share a lot of duplicate code, and can serve as a base for porting other Gigabyte 7 series motherboards. Switch the Gigabyte GA-B75M-D3H/D3V mainboard trees to a variant setup, defining ga-b75m-d3v as a variant of ga-b75m-d3h.
Signed-off-by: Alex James theracermaster@gmail.com Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32708 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name M src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc M src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c M src/mainboard/gigabyte/ga-b75m-d3h/romstage.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/include/variant/hda_verb.h R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/board_info.txt R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gma-mainboard.ads R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gpio.c R src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/include/variant/hda_verb.h D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name D src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc D src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/mainboard.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl D src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c D src/mainboard/gigabyte/ga-b75m-d3v/cmos.default D src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout D src/mainboard/gigabyte/ga-b75m-d3v/data.vbt D src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb D src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl D src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c D src/mainboard/gigabyte/ga-b75m-d3v/romstage.c 28 files changed, 34 insertions(+), 654 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig index af884f6..ceb2dbc 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig +++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig @@ -1,4 +1,4 @@ -if BOARD_GIGABYTE_GA_B75M_D3H +if BOARD_GIGABYTE_GA_B75M_D3H || BOARD_GIGABYTE_GA_B75M_D3V
config BOARD_SPECIFIC_OPTIONS def_bool y @@ -30,12 +30,23 @@ string default gigabyte/ga-b75m-d3h
+config VARIANT_DIR + string + default "ga-b75m-d3h" if BOARD_GIGABYTE_GA_B75M_D3H + default "ga-b75m-d3v" if BOARD_GIGABYTE_GA_B75M_D3V + config MAINBOARD_PART_NUMBER string - default "GA-B75M-D3H" + default "GA-B75M-D3H" if BOARD_GIGABYTE_GA_B75M_D3H + default "GA-B75M-D3V" if BOARD_GIGABYTE_GA_B75M_D3V
config MAX_CPUS int default 8
-endif # BOARD_GIGABYTE_GA_B75M_D3H +# Override the default variant behavior, since the data.vbt is the same +config INTEL_GMA_VBT_FILE + string + default "src/mainboard/$(MAINBOARDDIR)/data.vbt" + +endif # BOARD_GIGABYTE_GA_B75M* diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name index 571f6d1..f8fbe54 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name +++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name @@ -1,2 +1,5 @@ config BOARD_GIGABYTE_GA_B75M_D3H bool "GA-B75M-D3H" + +config BOARD_GIGABYTE_GA_B75M_D3V + bool "GA-B75M-D3V" diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc b/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc index 63976c4..07fc277 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc +++ b/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc @@ -13,5 +13,10 @@ ## GNU General Public License for more details. ##
-romstage-y += gpio.c -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +romstage-y += variants/$(VARIANT_DIR)/gpio.c + +ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads + +subdirs-y += variants/$(VARIANT_DIR) + +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c b/src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c index 23cd570..34610f0 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c @@ -13,9 +13,7 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - /* FIXME: Add configuration for sound */ -}; +#include <variant/hda_verb.h>
const u32 pc_beep_verbs[] = {};
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c b/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c index 4964785..67bcbcb 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c @@ -88,6 +88,7 @@ { }
+/* FIXME: The GA-B75M-D3V only has two DIMM slots! */ void mainboard_get_spd(spd_raw_data *spd, bool id_only) { read_spd(&spd[0], 0x50, id_only); diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/gma-mainboard.ads b/src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gma-mainboard.ads similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/gma-mainboard.ads rename to src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gma-mainboard.ads diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/gpio.c b/src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gpio.c similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3h/gpio.c rename to src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/gpio.c diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/thermal.h b/src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/include/variant/hda_verb.h similarity index 60% rename from src/mainboard/gigabyte/ga-b75m-d3v/thermal.h rename to src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/include/variant/hda_verb.h index 9db6910..53e7c65 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/thermal.h +++ b/src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3h/include/variant/hda_verb.h @@ -1,9 +1,6 @@ /* * This file is part of the coreboot project. * - * Copyright (C) 2011 The Chromium OS Authors. All rights reserved. - * Copyright (C) 2014 Vladimir Serbinenko - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. @@ -14,13 +11,11 @@ * GNU General Public License for more details. */
-#ifndef GAB75MD3H_THERMAL_H -#define GAB75MD3H_THERMAL_H +#ifndef GA_B75M_D3H_HDA_VERB_H +#define GA_B75M_D3H_HDA_VERB_H
- /* Temperature which OS will shutdown at */ - #define CRITICAL_TEMPERATURE 100 - - /* Temperature which OS will throttle CPU */ - #define PASSIVE_TEMPERATURE 90 +const u32 cim_verb_data[] = { + /* FIXME: Add configuration for sound */ +};
#endif diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/board_info.txt b/src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/board_info.txt similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3v/board_info.txt rename to src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/board_info.txt diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/gma-mainboard.ads b/src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gma-mainboard.ads similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3v/gma-mainboard.ads rename to src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gma-mainboard.ads diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/gpio.c b/src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gpio.c similarity index 100% rename from src/mainboard/gigabyte/ga-b75m-d3v/gpio.c rename to src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/gpio.c diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/hda_verb.c b/src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/include/variant/hda_verb.h similarity index 92% rename from src/mainboard/gigabyte/ga-b75m-d3v/hda_verb.c rename to src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/include/variant/hda_verb.h index 3ae6b5d..c84c80d 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/hda_verb.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/variants/ga-b75m-d3v/include/variant/hda_verb.h @@ -11,7 +11,8 @@ * GNU General Public License for more details. */
-#include <device/azalia_device.h> +#ifndef GA_B75M_D3V_HDA_VERB_H +#define GA_B75M_D3V_HDA_VERB_H
const u32 cim_verb_data[] = { /* coreboot specific header */ @@ -36,6 +37,4 @@ AZALIA_PIN_CFG(0, 0x1f, 0x411111f0) };
-const u32 pc_beep_verbs[] = {}; - -AZALIA_ARRAY_SIZES; +#endif diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig deleted file mode 100644 index d86c742..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig +++ /dev/null @@ -1,41 +0,0 @@ -if BOARD_GIGABYTE_GA_B75M_D3V - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select ARCH_X86 - select NORTHBRIDGE_INTEL_SANDYBRIDGE - select USE_NATIVE_RAMINIT - select SOUTHBRIDGE_INTEL_C216 - select SUPERIO_ITE_IT8728F - select BOARD_ROMSIZE_KB_8192 - select HAVE_ACPI_TABLES - select HAVE_OPTION_TABLE - select HAVE_CMOS_DEFAULT - select HAVE_ACPI_RESUME - select INTEL_GMA_HAVE_VBT - select INTEL_INT15 - select SERIRQ_CONTINUOUS_MODE - select MAINBOARD_HAS_LIBGFXINIT - select MAINBOARD_HAS_LPC_TPM - -config DRAM_RESET_GATE_GPIO - int - default 25 - -config USBDEBUG_HCD_INDEX - int - default 2 - -config MAINBOARD_DIR - string - default gigabyte/ga-b75m-d3v - -config MAINBOARD_PART_NUMBER - string - default "GA-B75M-D3V" - -config MAX_CPUS - int - default 8 - -endif # BOARD_GIGABYTE_GA_B75M_D3V diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name deleted file mode 100644 index 92f5744..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_GIGABYTE_GA_B75M_D3V - bool "GA-B75M-D3V" diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc b/src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc deleted file mode 100644 index 63976c4..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc +++ /dev/null @@ -1,17 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -romstage-y += gpio.c -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl deleted file mode 100644 index e69de29..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/ec.asl +++ /dev/null diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/mainboard.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/mainboard.asl deleted file mode 100644 index a1c7989..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/mainboard.asl +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 Google Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -Scope (_SB) -{ - Device (PWRB) - { - Name (_HID, EisaId ("PNP0C0C")) - } -} diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl deleted file mode 100644 index 10856d3..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 The Chromium OS Authors. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* The _PTS method (Prepare To Sleep) is called before the OS is - * entering a sleep state. The sleep state number is passed in Arg0 - */ - -Method (_PTS, 1) -{ -} - -/* The _WAK method is called on system wakeup */ - -Method(_WAK,1) -{ - Return (Package () {0, 0}) -} diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl deleted file mode 100644 index e69de29..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/superio.asl +++ /dev/null diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl deleted file mode 100644 index ca561a5..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl +++ /dev/null @@ -1,63 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 The Chromium OS Authors. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// Thermal Zone - -External (\PPKG, MethodObj) - -Scope (_TZ) -{ - ThermalZone (THRM) - { - Name (_TC1, 0x02) - Name (_TC2, 0x03) - - // Thermal zone polling frequency: 10 seconds - Name (_TZP, 100) - - // Thermal sampling period for passive cooling: 10 seconds - Name (_TSP, 100) - - // Convert from Degrees C to 1/10 Kelvin for ACPI - Method (CTOK, 1) - { - // 10th of Degrees C - Multiply (Arg0, 10, Local0) - - // Convert to Kelvin - Add (Local0, 2732, Local0) - - Return (Local0) - } - - // Threshold for OS to shutdown - Method (_CRT, 0, Serialized) - { - Return (CTOK (\TCRT)) - } - - // Threshold for passive cooling - Method (_PSV, 0, Serialized) - { - Return (CTOK (\TPSV)) - } - - // Processors used for passive cooling - Method (_PSL, 0, Serialized) - { - Return (\PPKG ()) - } - } -} diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c deleted file mode 100644 index 5c09059..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <string.h> -#include <southbridge/intel/bd82x6x/nvs.h> -#include "thermal.h" - -static void acpi_update_thermal_table(global_nvs_t *gnvs) -{ - gnvs->tcrt = CRITICAL_TEMPERATURE; - gnvs->tpsv = PASSIVE_TEMPERATURE; -} - -void acpi_create_gnvs(global_nvs_t *gnvs) -{ - memset((void *)gnvs, 0, sizeof(*gnvs)); - - /* Disable USB ports in S3 by default */ - gnvs->s3u0 = 0; - gnvs->s3u1 = 0; - - /* Disable USB ports in S5 by default */ - gnvs->s5u0 = 0; - gnvs->s5u1 = 0; - - acpi_update_thermal_table(gnvs); -} diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default deleted file mode 100644 index 6f3cec7..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default +++ /dev/null @@ -1,6 +0,0 @@ -boot_option=Fallback -debug_level=Debug -power_on_after_fail=Enable -nmi=Enable -sata_mode=AHCI -gfx_uma_size=32M diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout deleted file mode 100644 index 095e383..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout +++ /dev/null @@ -1,107 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## Copyright (C) 2014 Vladimir Serbinenko -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -# ----------------------------------------------------------------- -entries - -# ----------------------------------------------------------------- -# Status Register A -# ----------------------------------------------------------------- -# Status Register B -# ----------------------------------------------------------------- -# Status Register C -#96 4 r 0 status_c_rsvd -#100 1 r 0 uf_flag -#101 1 r 0 af_flag -#102 1 r 0 pf_flag -#103 1 r 0 irqf_flag -# ----------------------------------------------------------------- -# Status Register D -#104 7 r 0 status_d_rsvd -#111 1 r 0 valid_cmos_ram -# ----------------------------------------------------------------- -# Diagnostic Status Register -#112 8 r 0 diag_rsvd1 - -# ----------------------------------------------------------------- -0 120 r 0 reserved_memory -#120 264 r 0 unused - -# ----------------------------------------------------------------- -# RTC_BOOT_BYTE (coreboot hardcoded) -384 1 e 4 boot_option -388 4 h 0 reboot_counter -#390 2 r 0 unused? - -# ----------------------------------------------------------------- -# coreboot config options: console -#392 3 r 0 unused -395 4 e 6 debug_level -#399 1 r 0 unused - -# coreboot config options: southbridge -408 1 e 1 nmi -409 2 e 7 power_on_after_fail - -#411 10 r 0 unused -421 1 e 9 sata_mode -#422 2 r 0 unused - -# coreboot config options: cpu -#425 7 r 0 unused - -# coreboot config options: northbridge -432 3 e 11 gfx_uma_size -#435 549 r 0 unused - -# coreboot config options: check sums -984 16 h 0 check_sum - -# ----------------------------------------------------------------- - -enumerations - -#ID value text -1 0 Disable -1 1 Enable -4 0 Fallback -4 1 Normal -6 0 Emergency -6 1 Alert -6 2 Critical -6 3 Error -6 4 Warning -6 5 Notice -6 6 Info -6 7 Debug -6 8 Spew -7 0 Disable -7 1 Enable -7 2 Keep -9 0 AHCI -9 1 IDE -11 0 32M -11 1 64M -11 2 96M -11 3 128M -11 4 160M -11 5 192M -11 6 224M - -# ----------------------------------------------------------------- -checksums - -checksum 392 439 984 diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/data.vbt b/src/mainboard/gigabyte/ga-b75m-d3v/data.vbt deleted file mode 100644 index ccbf6ee..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/data.vbt +++ /dev/null Binary files differ diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb deleted file mode 100644 index ceb9279..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb +++ /dev/null @@ -1,124 +0,0 @@ -chip northbridge/intel/sandybridge - # IGD Displays - register "gfx.ndid" = "3" - register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" - - device cpu_cluster 0 on - chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" - register "c1_battery" = "1" - register "c2_battery" = "3" - register "c3_battery" = "5" - # Magic APIC ID to locate this chip - device lapic 0x0 on end - device lapic 0xacac off end - end - end - - register "pci_mmio_size" = "2048" - - device domain 0 on - subsystemid 0x1458 0x5000 inherit - device pci 00.0 on # Host bridge - subsystemid 0x1458 0x5000 - end - device pci 01.0 on end # PCIe Bridge for discrete graphics - device pci 02.0 on # Integrated VGA controller - subsystemid 0x1458 0xd000 - end - - chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH - # GPI routing - register "alt_gp_smi_en" = "0x0000" - register "gen1_dec" = "0x003c0a01" - - # Set max SATA speed to 6.0 Gb/s - register "sata_port_map" = "0x3f" - register "sata_interface_speed_support" = "0x3" - - register "pcie_port_coalesce" = "0" - register "p_cnt_throttling_supported" = "0" - register "docking_supported" = "0" - register "c2_latency" = "0x0065" - - device pci 14.0 on # USB 3.0 Controller - subsystemid 0x1458 0x5007 - end - device pci 16.0 on end # Management Engine Interface 1 - device pci 16.1 off end # Management Engine Interface 2 - device pci 16.2 off end # Management Engine IDE-R - device pci 16.3 off end # Management Engine KT - device pci 19.0 off end # Intel Gigabit Ethernet - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x1458 0x5006 - end - device pci 1b.0 on # High Definition Audio - subsystemid 0x1458 0xa002 - end - device pci 1c.0 on end # PCIe Port #1 - device pci 1c.1 off end # PCIe Port #2 - device pci 1c.2 off end # PCIe Port #3 - device pci 1c.3 off end # PCIe Port #4 - device pci 1c.4 on # PCIe Port #5 - device pci 00.0 on # PCI 10ec:8168 - subsystemid 0x1458 0xe000 - end - end - device pci 1c.5 off end # PCIe Port #6 - device pci 1c.6 off end # PCIe Port #7 - device pci 1c.7 off end # PCIe Port #8 - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x1458 0x5006 - end - device pci 1e.0 on end # PCI bridge - device pci 1f.0 on # ISA/LPC bridge - subsystemid 0x1458 0x5001 - chip superio/ite/it8728f - device pnp 2e.0 off end # FDC - device pnp 2e.1 on # Serial Port 1 - io 0x60 = 0x3f8 - irq 0x70 = 4 - end - device pnp 2e.2 on - io 0x60 = 0x2f8 - irq 0x70 = 3 - end - device pnp 2e.3 on - io 0x60 = 0x378 - irq 0x70 = 7 - drq 0x74 = 4 - end - device pnp 2e.4 on # EC - io 0x60 = 0xa30 - irq 0x70 = 9 - io 0x62 = 0xa20 - end - device pnp 2e.5 on # Keyboard - io 0x60 = 0x60 - irq 0x70 = 1 - io 0x62 = 0x64 - end - device pnp 2e.6 on # Mouse - irq 0x70 = 12 - end - device pnp 2e.7 off end # GPIO - device pnp 2e.a off end # IR - end - - chip drivers/pc80/tpm - device pnp 0c31.0 on end - end - end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x1458 0xb005 - end - device pci 1f.3 on # SMBus - subsystemid 0x1458 0x5001 - end - device pci 1f.4 off end - device pci 1f.5 off end # SATA Controller 2 - end - end -end diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl b/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl deleted file mode 100644 index c00ee30..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <arch/acpi.h> -DefinitionBlock( - "dsdt.aml", - "DSDT", - 0x02, // DSDT revision: ACPI v2.0 and up - OEM_ID, - ACPI_TABLE_CREATOR, - 0x20141018 // OEM revision -) -{ - #include <southbridge/intel/bd82x6x/acpi/platform.asl> - - // Some generic macros - #include "acpi/mainboard.asl" - #include "acpi/platform.asl" - #include "acpi/thermal.asl" - #include <cpu/intel/common/acpi/cpu.asl> - /* global NVS and variables. */ - #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <southbridge/intel/bd82x6x/acpi/sleepstates.asl> - - Scope (_SB) { - Device (PCI0) - { - #include <northbridge/intel/sandybridge/acpi/sandybridge.asl> - #include <southbridge/intel/bd82x6x/acpi/pch.asl> - #include <drivers/intel/gma/acpi/default_brightness_levels.asl> - } - } -} diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c deleted file mode 100644 index cc26757..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * Copyright (C) 2011-2012 Google Inc. - * Copyright (C) 2014 Vladimir Serbinenko - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <device/device.h> -#include <drivers/intel/gma/int15.h> -#include <southbridge/intel/bd82x6x/pch.h> - -// mainboard_enable is executed as first thing after -// enumerate_buses(). - -static void mainboard_enable(struct device *dev) -{ - install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_NONE, - GMA_INT15_PANEL_FIT_DEFAULT, - GMA_INT15_BOOT_DISPLAY_DEFAULT, 0); -} - -struct chip_operations mainboard_ops = { - .enable_dev = mainboard_enable -}; diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c b/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c deleted file mode 100644 index eb88d36..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c +++ /dev/null @@ -1,104 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Damien Zammit damien@zamaudio.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <device/pci_ops.h> -#include <northbridge/intel/sandybridge/raminit_native.h> -#include <northbridge/intel/sandybridge/sandybridge.h> -#include <southbridge/intel/bd82x6x/pch.h> -#include <superio/ite/common/ite.h> -#include <superio/ite/it8728f/it8728f.h> - -#define SUPERIO_BASE 0x2e -#define SUPERIO_DEV PNP_DEV(SUPERIO_BASE, 0) -#define SIO_GPIO PNP_DEV(SUPERIO_BASE, IT8728F_GPIO) -#define SERIAL_DEV PNP_DEV(SUPERIO_BASE, 0x01) - -void pch_enable_lpc(void) -{ - pci_write_config16(PCH_LPC_DEV, LPC_EN, KBC_LPC_EN | - CNF1_LPC_EN | CNF2_LPC_EN | COMA_LPC_EN); - - pci_write_config32(PCH_LPC_DEV, LPC_GEN1_DEC, 0x3c0a01); - pci_write_config16(PCH_LPC_DEV, LPC_IO_DEC, 0x10); - - pci_write_config32(PCH_LPC_DEV, ETR3, 0x10000); -} - -void mainboard_config_superio(void) -{ - /* Initialize SuperIO */ - ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - - ite_reg_write(SIO_GPIO, 0xEF, 0x7E); // magic SIO disable reboot - - /* FIXME: These values could be configured in ramstage */ - ite_reg_write(SIO_GPIO, 0x25, 0x40); // gpio pin function -> gp16 - ite_reg_write(SIO_GPIO, 0x27, 0x10); // gpio pin function -> gp34 - ite_reg_write(SIO_GPIO, 0x2c, 0x80); // smbus isolation on parallel port - ite_reg_write(SIO_GPIO, 0x62, 0x0a); // simple iobase 0xa00 - ite_reg_write(SIO_GPIO, 0x72, 0x20); // watchdog timeout clear! - ite_reg_write(SIO_GPIO, 0x73, 0x00); // watchdog timeout clear! - ite_reg_write(SIO_GPIO, 0xcb, 0x00); // simple io set4 direction -> in - ite_reg_write(SIO_GPIO, 0xe9, 0x27); // bus select disable - ite_reg_write(SIO_GPIO, 0xf0, 0x10); // ? - ite_reg_write(SIO_GPIO, 0xf1, 0x42); // ? - ite_reg_write(SIO_GPIO, 0xf6, 0x1c); // hwmon alert beep -> gp36(pin12) - - /* EC SIO settings */ - ite_reg_write(IT8728F_EC, 0xf1, 0xc0); - ite_reg_write(IT8728F_EC, 0xf6, 0xf0); - ite_reg_write(IT8728F_EC, 0xf9, 0x48); - ite_reg_write(IT8728F_EC, 0x60, 0x0a); - ite_reg_write(IT8728F_EC, 0x61, 0x30); - ite_reg_write(IT8728F_EC, 0x62, 0x0a); - ite_reg_write(IT8728F_EC, 0x63, 0x20); - ite_reg_write(IT8728F_EC, 0x30, 0x01); -} - -const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 5, 0 }, - { 1, 5, 0 }, - { 1, 5, 1 }, - { 1, 5, 1 }, - { 1, 5, 2 }, - { 1, 5, 2 }, - { 1, 5, 3 }, - { 1, 5, 3 }, - { 1, 5, 4 }, - { 1, 5, 4 }, - { 1, 5, 6 }, - { 1, 5, 5 }, - { 1, 5, 5 }, - { 1, 5, 6 }, -}; - -void mainboard_early_init(int s3resume) -{ -} - -/* FIXME: This board only has two DIMM slots! */ -void mainboard_get_spd(spd_raw_data *spd, bool id_only) -{ - read_spd(&spd[0], 0x50, id_only); - read_spd(&spd[1], 0x51, id_only); - read_spd(&spd[2], 0x52, id_only); - read_spd(&spd[3], 0x53, id_only); -} - -void mainboard_rcba_config(void) -{ - /* Enable HECI */ - RCBA32(FD2) &= ~0x2; -}
-
Alex James (Code Review) -
Angel Pons (Code Review)
-
Arthur Heymans (Code Review)
-
build bot (Jenkins) (Code Review)
-
Nico Huber (Code Review)
-
Patrick Georgi (Code Review)