Alex James has uploaded this change for review.

View Change

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

To view, visit change 32708. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia175207a2568aefe1aa9bd8d4d990de6a26f1657
Gerrit-Change-Number: 32708
Gerrit-PatchSet: 1
Gerrit-Owner: Alex James <theracermaster@gmail.com>
Gerrit-MessageType: newchange