Patrick Georgi merged this change.

View Change

Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
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(-)

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;
-}

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: 16
Gerrit-Owner: Alex James <theracermaster@gmail.com>
Gerrit-Reviewer: Alex James <theracermaster@gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Martin Roth <martinroth@google.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-MessageType: merged