Attention is currently required from: Angel Pons. Bill XIE has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/54337 )
Change subject: mb/asus/p8z77: Turn P8Z77-V LX2 into a variant of P8x7x baseboard ......................................................................
mb/asus/p8z77: Turn P8Z77-V LX2 into a variant of P8x7x baseboard
Other variants would be added later.
Signed-off-by: Bill XIE persmule@hardenedlinux.org Change-Id: Id9a7f1069233b43eb4a046f2e61c7a72fec7e960 --- M src/mainboard/asus/p8x7x/Kconfig M src/mainboard/asus/p8x7x/Kconfig.name M src/mainboard/asus/p8x7x/variants/z77-m_pro/overridetree.cb R src/mainboard/asus/p8x7x/variants/z77-v_lx2/acpi_tables.c A src/mainboard/asus/p8x7x/variants/z77-v_lx2/board_info.txt R src/mainboard/asus/p8x7x/variants/z77-v_lx2/data.vbt R src/mainboard/asus/p8x7x/variants/z77-v_lx2/early_init.c R src/mainboard/asus/p8x7x/variants/z77-v_lx2/gma-mainboard.ads R src/mainboard/asus/p8x7x/variants/z77-v_lx2/gpio.c R src/mainboard/asus/p8x7x/variants/z77-v_lx2/hda_verb.c A src/mainboard/asus/p8x7x/variants/z77-v_lx2/mainboard.c A src/mainboard/asus/p8x7x/variants/z77-v_lx2/overridetree.cb D src/mainboard/asus/p8z77-v_lx2/Kconfig D src/mainboard/asus/p8z77-v_lx2/Kconfig.name D src/mainboard/asus/p8z77-v_lx2/Makefile.inc D src/mainboard/asus/p8z77-v_lx2/acpi/ec.asl D src/mainboard/asus/p8z77-v_lx2/acpi/platform.asl D src/mainboard/asus/p8z77-v_lx2/acpi/superio.asl D src/mainboard/asus/p8z77-v_lx2/board_info.txt D src/mainboard/asus/p8z77-v_lx2/cmos.default D src/mainboard/asus/p8z77-v_lx2/cmos.layout D src/mainboard/asus/p8z77-v_lx2/devicetree.cb D src/mainboard/asus/p8z77-v_lx2/dsdt.asl 23 files changed, 53 insertions(+), 274 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/54337/1
diff --git a/src/mainboard/asus/p8x7x/Kconfig b/src/mainboard/asus/p8x7x/Kconfig index 4cfd3c4..163e337 100644 --- a/src/mainboard/asus/p8x7x/Kconfig +++ b/src/mainboard/asus/p8x7x/Kconfig @@ -1,6 +1,6 @@ ## SPDX-License-Identifier: GPL-2.0-only
-if BOARD_ASUS_P8Z77_M_PRO +if BOARD_ASUS_P8Z77_M_PRO || BOARD_ASUS_P8Z77_V_LX2
config BOARD_SPECIFIC_OPTIONS def_bool y @@ -28,13 +28,15 @@ config VARIANT_DIR string default "z77-m_pro" if BOARD_ASUS_P8Z77_M_PRO + default "z77-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 OVERRIDE_DEVICETREE string default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
-endif # BOARD_ASUS_P8Z77_M_PRO +endif # BOARD_ASUS_P8Z77_M_PRO || BOARD_ASUS_P8Z77_V_LX2 diff --git a/src/mainboard/asus/p8x7x/Kconfig.name b/src/mainboard/asus/p8x7x/Kconfig.name index 372ec4a..2777435 100644 --- a/src/mainboard/asus/p8x7x/Kconfig.name +++ b/src/mainboard/asus/p8x7x/Kconfig.name @@ -2,3 +2,6 @@
config BOARD_ASUS_P8Z77_M_PRO bool "P8Z77-M PRO" + +config BOARD_ASUS_P8Z77_V_LX2 + bool "P8Z77-V LX2" diff --git a/src/mainboard/asus/p8x7x/variants/z77-m_pro/overridetree.cb b/src/mainboard/asus/p8x7x/variants/z77-m_pro/overridetree.cb index e85e647..0edc99b 100644 --- a/src/mainboard/asus/p8x7x/variants/z77-m_pro/overridetree.cb +++ b/src/mainboard/asus/p8x7x/variants/z77-m_pro/overridetree.cb @@ -5,7 +5,7 @@ chip southbridge/intel/bd82x6x register "gen4_dec" = "0x0000ff29" register "pcie_port_coalesce" = "1" - device pci 1c.0 on end # PCIe Port 1 PCIEX_16_3 + device pci 1c.0 on end # PCIe Port 1 PCIEX_16_3 (electrical x4) device pci 1c.1 on end # PCIe Port 2 RTL8111F device pci 1c.5 on end # PCIe Port 6 ASM1042 USB3 device pci 1c.6 on end # PCIe Port 7 ASM1061 eSATA diff --git a/src/mainboard/asus/p8z77-v_lx2/acpi_tables.c b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/acpi_tables.c similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/acpi_tables.c rename to src/mainboard/asus/p8x7x/variants/z77-v_lx2/acpi_tables.c diff --git a/src/mainboard/asus/p8x7x/variants/z77-v_lx2/board_info.txt b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/board_info.txt new file mode 100644 index 0000000..1c08708 --- /dev/null +++ b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/board_info.txt @@ -0,0 +1,3 @@ +Board name: ASUS P8Z77-V LX2 +Board URL: https://www.asus.com/uk/Motherboards/P8Z77V_LX2/ +Release year: 2013 diff --git a/src/mainboard/asus/p8z77-v_lx2/data.vbt b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/data.vbt similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/data.vbt rename to src/mainboard/asus/p8x7x/variants/z77-v_lx2/data.vbt Binary files differ diff --git a/src/mainboard/asus/p8z77-v_lx2/early_init.c b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/early_init.c similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/early_init.c rename to src/mainboard/asus/p8x7x/variants/z77-v_lx2/early_init.c diff --git a/src/mainboard/asus/p8z77-v_lx2/gma-mainboard.ads b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/gma-mainboard.ads similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/gma-mainboard.ads rename to src/mainboard/asus/p8x7x/variants/z77-v_lx2/gma-mainboard.ads diff --git a/src/mainboard/asus/p8z77-v_lx2/gpio.c b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/gpio.c similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/gpio.c rename to src/mainboard/asus/p8x7x/variants/z77-v_lx2/gpio.c diff --git a/src/mainboard/asus/p8z77-v_lx2/hda_verb.c b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/hda_verb.c similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/hda_verb.c rename to src/mainboard/asus/p8x7x/variants/z77-v_lx2/hda_verb.c diff --git a/src/mainboard/asus/p8x7x/variants/z77-v_lx2/mainboard.c b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/mainboard.c new file mode 100644 index 0000000..ac992f6 --- /dev/null +++ b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/mainboard.c @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <device/device.h> +#include <drivers/intel/gma/int15.h> + +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/asus/p8x7x/variants/z77-v_lx2/overridetree.cb b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/overridetree.cb new file mode 100644 index 0000000..da8d1ff --- /dev/null +++ b/src/mainboard/asus/p8x7x/variants/z77-v_lx2/overridetree.cb @@ -0,0 +1,26 @@ +## SPDX-License-Identifier: GPL-2.0-only + +chip northbridge/intel/sandybridge + device domain 0x0 on + chip southbridge/intel/bd82x6x + device pci 1c.0 on end # PCIe Port 1 PCIEX_16_2 (electrical x4) + device pci 1c.4 on end # PCIe Port 5 RTL8111 GbE NIC + device pci 1c.5 on end # RP #6: ASM1083 PCI Bridge + device pci 1c.6 on end # RP #7: PCIEX1_1 + device pci 1c.7 on end # RP #8: PCIEX1_2 + device pci 1f.0 on # LPC bridge + chip superio/nuvoton/nct6779d + device pnp 2e.2 on # UART A + io 0x60 = 0x3f8 + irq 0x70 = 4 + end + device pnp 2e.209 on # GPIO2 + irq 0xe0 = 0xff + end + device pnp 2e.a on # ACPI + end + end + end + end + end +end diff --git a/src/mainboard/asus/p8z77-v_lx2/Kconfig b/src/mainboard/asus/p8z77-v_lx2/Kconfig deleted file mode 100644 index 108d61a..0000000 --- a/src/mainboard/asus/p8z77-v_lx2/Kconfig +++ /dev/null @@ -1,29 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -if BOARD_ASUS_P8Z77_V_LX2 - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select BOARD_ROMSIZE_KB_8192 - select HAVE_ACPI_RESUME - select HAVE_ACPI_TABLES - select HAVE_CMOS_DEFAULT - select HAVE_OPTION_TABLE - select INTEL_GMA_HAVE_VBT - select MAINBOARD_HAS_LIBGFXINIT - select NORTHBRIDGE_INTEL_SANDYBRIDGE - select REALTEK_8168_RESET - select SERIRQ_CONTINUOUS_MODE - select SOUTHBRIDGE_INTEL_C216 - select SUPERIO_NUVOTON_NCT6779D - select USE_NATIVE_RAMINIT - -config MAINBOARD_DIR - string - default "asus/p8z77-v_lx2" - -config MAINBOARD_PART_NUMBER - string - default "P8Z77-V LX2" - -endif diff --git a/src/mainboard/asus/p8z77-v_lx2/Kconfig.name b/src/mainboard/asus/p8z77-v_lx2/Kconfig.name deleted file mode 100644 index 0dec75f..0000000 --- a/src/mainboard/asus/p8z77-v_lx2/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_ASUS_P8Z77_V_LX2 - bool "P8Z77-V LX2" diff --git a/src/mainboard/asus/p8z77-v_lx2/Makefile.inc b/src/mainboard/asus/p8z77-v_lx2/Makefile.inc deleted file mode 100644 index 7167e10..0000000 --- a/src/mainboard/asus/p8z77-v_lx2/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -bootblock-y += early_init.c -bootblock-y += gpio.c - -romstage-y += early_init.c -romstage-y += gpio.c - -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads diff --git a/src/mainboard/asus/p8z77-v_lx2/acpi/ec.asl b/src/mainboard/asus/p8z77-v_lx2/acpi/ec.asl deleted file mode 100644 index e69de29..0000000 --- a/src/mainboard/asus/p8z77-v_lx2/acpi/ec.asl +++ /dev/null diff --git a/src/mainboard/asus/p8z77-v_lx2/acpi/platform.asl b/src/mainboard/asus/p8z77-v_lx2/acpi/platform.asl deleted file mode 100644 index 7da03bf..0000000 --- a/src/mainboard/asus/p8z77-v_lx2/acpi/platform.asl +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -Method(_PTS, 1) -{ -} - -Method(_WAK, 1) -{ - Return(Package(){0, 0}) -} diff --git a/src/mainboard/asus/p8z77-v_lx2/acpi/superio.asl b/src/mainboard/asus/p8z77-v_lx2/acpi/superio.asl deleted file mode 100644 index f2b35ba..0000000 --- a/src/mainboard/asus/p8z77-v_lx2/acpi/superio.asl +++ /dev/null @@ -1 +0,0 @@ -#include <drivers/pc80/pc/ps2_controller.asl> diff --git a/src/mainboard/asus/p8z77-v_lx2/board_info.txt b/src/mainboard/asus/p8z77-v_lx2/board_info.txt deleted file mode 100644 index 79c36d6..0000000 --- a/src/mainboard/asus/p8z77-v_lx2/board_info.txt +++ /dev/null @@ -1,7 +0,0 @@ -Category: desktop -Board URL: https://www.asus.com/uk/Motherboards/P8Z77V_LX2/ -ROM package: DIP-8 -ROM protocol: SPI -ROM socketed: y -Flashrom support: y -Release year: 2013 diff --git a/src/mainboard/asus/p8z77-v_lx2/cmos.default b/src/mainboard/asus/p8z77-v_lx2/cmos.default deleted file mode 100644 index c7aa620..0000000 --- a/src/mainboard/asus/p8z77-v_lx2/cmos.default +++ /dev/null @@ -1,6 +0,0 @@ -boot_option=Fallback -debug_level=Debug -nmi=Disable -power_on_after_fail=Disable -sata_mode=AHCI -gfx_uma_size=64M diff --git a/src/mainboard/asus/p8z77-v_lx2/cmos.layout b/src/mainboard/asus/p8z77-v_lx2/cmos.layout deleted file mode 100644 index 0f9de5e..0000000 --- a/src/mainboard/asus/p8z77-v_lx2/cmos.layout +++ /dev/null @@ -1,86 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# ----------------------------------------------------------------- -entries - -# ----------------------------------------------------------------- -0 120 r 0 reserved_memory - -# ----------------------------------------------------------------- -# RTC_BOOT_BYTE (coreboot hardcoded) -384 1 e 2 boot_option -388 4 h 0 reboot_counter - -# ----------------------------------------------------------------- -# coreboot config options: console -395 4 e 3 debug_level - -# coreboot config options: southbridge -408 1 e 1 nmi - -409 2 e 4 power_on_after_fail -411 2 e 5 sata_mode - -# coreboot config options: northbridge -416 5 e 6 gfx_uma_size - -# coreboot config options: check sums -984 16 h 0 check_sum - -# ----------------------------------------------------------------- - -enumerations -#ID value text - -# Generic on/off enum -1 0 Disable -1 1 Enable - -# boot_option -2 0 Fallback -2 1 Normal - -# debug_level -3 0 Emergency -3 1 Alert -3 2 Critical -3 3 Error -3 4 Warning -3 5 Notice -3 6 Info -3 7 Debug -3 8 Spew - -# power_on_after_fail -4 0 Disable -4 1 Enable -4 2 Keep - -# sata_mode -5 0 AHCI -5 1 Compatible -5 2 Legacy - -# gfx_uma_size (Intel IGP Video RAM size) -6 0 32M -6 1 64M -6 2 96M -6 3 128M -6 4 160M -6 5 192M -6 6 224M -6 7 256M -6 8 288M -6 9 320M -6 10 352M -6 11 384M -6 12 416M -6 13 448M -6 14 480M -6 15 512M -6 16 1024M - -# ----------------------------------------------------------------- -checksums - -checksum 392 423 984 diff --git a/src/mainboard/asus/p8z77-v_lx2/devicetree.cb b/src/mainboard/asus/p8z77-v_lx2/devicetree.cb deleted file mode 100644 index 40f8e6d..0000000 --- a/src/mainboard/asus/p8z77-v_lx2/devicetree.cb +++ /dev/null @@ -1,97 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -chip northbridge/intel/sandybridge - device cpu_cluster 0 on - chip cpu/intel/model_206ax - register "acpi_c1" = "1" - register "acpi_c2" = "3" - register "acpi_c3" = "5" - device lapic 0 on end - device lapic 0xacac off end - end - end - device domain 0 on - subsystemid 0x1043 0x84ca inherit - device pci 00.0 on end # Host bridge - device pci 01.0 on end # PCIEX16_1 - device pci 02.0 on end # iGPU - - chip southbridge/intel/bd82x6x - register "c2_latency" = "0x0065" - register "gen1_dec" = "0x000c0291" - register "sata_interface_speed_support" = "0x3" - register "sata_port_map" = "0x3f" - register "spi_lvscc" = "0x2005" - register "spi_uvscc" = "0x2005" - register "superspeed_capable_ports" = "0x0000000f" - register "xhci_overcurrent_mapping" = "0x00000c03" - register "xhci_switchable_ports" = "0x0000000f" - - device pci 14.0 on end # xHCI - device pci 16.0 on end # MEI #1 - device pci 16.1 off end # MEI #2 - device pci 16.2 off end # ME IDE-R - device pci 16.3 off end # ME KT - device pci 19.0 off end # Intel GbE - device pci 1a.0 on end # EHCI #2 - device pci 1b.0 on end # HD Audio - - device pci 1c.0 on end # RP #1: PCIEX16_2 (electrical x4) - device pci 1c.1 off end # RP #2: - device pci 1c.2 off end # RP #3: - device pci 1c.3 off end # RP #4: - device pci 1c.4 on end # RP #5: RTL8111 GbE NIC - device pci 1c.5 on end # RP #6: ASM1083 PCI Bridge - device pci 1c.6 on end # RP #7: PCIEX1_1 - device pci 1c.7 on end # RP #8: PCIEX1_2 - - device pci 1d.0 on end # EHCI #1 - device pci 1e.0 off end # PCI bridge - device pci 1f.0 on # LPC bridge - chip superio/nuvoton/nct6779d - device pnp 2e.1 off end # Parallel - device pnp 2e.2 on # UART A - io 0x60 = 0x3f8 - irq 0x70 = 4 - end - device pnp 2e.3 off end # UART B, IR - device pnp 2e.5 on # Keyboard - io 0x60 = 0x0060 - io 0x62 = 0x0064 - irq 0x70 = 1 - irq 0x72 = 12 - end - device pnp 2e.6 off end # CIR - device pnp 2e.7 off end # GPIO6-8 - device pnp 2e.8 off end # WDT1, GPIO0, GPIO1 - device pnp 2e.108 off end # GPIO0 - device pnp 2e.9 off end # GPIO8 - device pnp 2e.109 off end # GPIO1 - device pnp 2e.209 on # GPIO2 - irq 0xe0 = 0xff - end - device pnp 2e.309 off end # GPIO3 - device pnp 2e.409 off end # GPIO4 - device pnp 2e.509 off end # GPIO5 - device pnp 2e.609 off end # GPIO6 - device pnp 2e.709 off end # GPIO7 - device pnp 2e.a on end # ACPI - device pnp 2e.b on # H/W Monitor, FP LED - io 0x60 = 0x0290 - io 0x62 = 0 - irq 0x70 = 0 - end - device pnp 2e.d off end # WDT1 - device pnp 2e.e off end # CIR Wake-up - device pnp 2e.f off end # Push-pull/Open-drain - device pnp 2e.14 off end # Port 80 UART - device pnp 2e.16 off end # Deep Sleep - end - end - device pci 1f.2 on end # SATA (AHCI) - device pci 1f.3 on end # SMBus - device pci 1f.5 off end # SATA (Legacy) - device pci 1f.6 off end # Thermal - end - end -end diff --git a/src/mainboard/asus/p8z77-v_lx2/dsdt.asl b/src/mainboard/asus/p8z77-v_lx2/dsdt.asl deleted file mode 100644 index e8e2b3a..0000000 --- a/src/mainboard/asus/p8z77-v_lx2/dsdt.asl +++ /dev/null @@ -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> - } -}