mb/asus/p8z77-m_pro: Transform into variant

To preserve reproducibility, temporarily guard mainboard.c contents.

Tested with BUILD_TIMELESS=1, coreboot.rom for the Asus P8Z77-M PRO
remains identical when not adding the .config file in it.

Change-Id: I05e272690ca78f6b9e22b1db1c36cb9e5a7afe3c
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54411
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Angel Pons 2021-05-17 17:57:19 +02:00 committed by Patrick Georgi
parent 0da07d66bd
commit 6f92506415
20 changed files with 18 additions and 88 deletions

View File

@ -196,13 +196,9 @@ M: Angel Pons <th3fanbus@gmail.com>
S: Maintained
F: src/mainboard/asus/p5qpl-am/
ASUS P8Z77-M PRO MAINBOARD
M: Vlado Cibic <vladocb@protonmail.com>
S: Maintained
F: src/mainboard/asus/p8z77-m_pro/
ASUS P8Z77 SERIES MAINBOARDS
M: Angel Pons <th3fanbus@gmail.com>
M: Vlado Cibic <vladocb@protonmail.com>
S: Maintained
F: src/mainboard/asus/p8z77-series/

View File

@ -1,31 +0,0 @@
## SPDX-License-Identifier: GPL-2.0-only
if BOARD_ASUS_P8Z77_M_PRO
config BOARD_SPECIFIC_OPTIONS
def_bool y
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_C216
select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM1
select HAVE_OPTION_TABLE
select HAVE_CMOS_DEFAULT
select MAINBOARD_HAS_LIBGFXINIT
select INTEL_GMA_HAVE_VBT
select SUPERIO_NUVOTON_NCT6779D
select DRIVERS_ASMEDIA_ASPM_BLACKLIST # for ASM1061 eSATA
config MAINBOARD_DIR
string
default "asus/p8z77-m_pro"
config MAINBOARD_PART_NUMBER
string
default "P8Z77-M PRO"
endif # BOARD_ASUS_P8Z77_M_PRO

View File

@ -1,4 +0,0 @@
## SPDX-License-Identifier: GPL-2.0-only
config BOARD_ASUS_P8Z77_M_PRO
bool "P8Z77-M PRO"

View File

@ -1,8 +0,0 @@
## SPDX-License-Identifier: GPL-2.0-or-later
bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
bootblock-y += early_init.c
romstage-y += early_init.c

View File

@ -1 +0,0 @@

View File

@ -1,10 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
Method(_PTS,1)
{
}
Method(_WAK,1)
{
Return(Package(){0,0})
}

View File

@ -1,3 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <drivers/pc80/pc/ps2_controller.asl>

View File

@ -1,26 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
ACPI_DSDT_REV_2,
OEM_ID,
ACPI_TABLE_CREATOR,
0x20141018 /* OEM revision */
)
{
#include <acpi/dsdt_top.asl>
#include "acpi/platform.asl"
#include <cpu/intel/common/acpi/cpu.asl>
#include <southbridge/intel/common/acpi/platform.asl>
#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>
Device (\_SB.PCI0)
{
#include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
#include <southbridge/intel/bd82x6x/acpi/pch.asl>
}
}

View File

@ -20,10 +20,12 @@ config MAINBOARD_DIR
config VARIANT_DIR
string
default "p8z77-m_pro" if BOARD_ASUS_P8Z77_M_PRO
default "p8z77-v_lx2" if BOARD_ASUS_P8Z77_V_LX2
config MAINBOARD_PART_NUMBER
string
default "P8Z77-M PRO" if BOARD_ASUS_P8Z77_M_PRO
default "P8Z77-V LX2" if BOARD_ASUS_P8Z77_V_LX2
config DEVICETREE

View File

@ -1,3 +1,13 @@
config BOARD_ASUS_P8Z77_M_PRO
bool "P8Z77-M PRO"
select BOARD_ASUS_P8Z77_SERIES
select BOARD_ROMSIZE_KB_8192
select DRIVERS_ASMEDIA_ASPM_BLACKLIST # for ASM1061 eSATA
select INTEL_INT15
select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM1
select SUPERIO_NUVOTON_NCT6779D
config BOARD_ASUS_P8Z77_V_LX2
bool "P8Z77-V LX2"
select BOARD_ASUS_P8Z77_SERIES

View File

@ -1,5 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* TODO: remove */
#if CONFIG(INTEL_INT15)
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
@ -14,3 +17,5 @@ static void mainboard_enable(struct device *dev)
struct chip_operations mainboard_ops = {
.enable_dev = mainboard_enable
};
#endif