coreboot-gerrit February 2016

coreboot-gerrit@coreboot.org

1 participants
1305 discussions

Patch set updated for coreboot: WIP: mainboard/asus: Add F2A85-M PRO variant to F2A85-M.
by Denis Carikli 23 Feb '16

23 Feb '16

Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12301 -gerrit commit 22f91ddb542f7693d30c10279f0fe0b848939bfd Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Sun Jul 26 19:57:51 2015 +0200 WIP: mainboard/asus: Add F2A85-M PRO variant to F2A85-M. The board boots. -> The GPU works. -> USB keyboard and mouse work. -> Not all USB ports were fully tested. -> The onboard ethernet card doesn't work. -> Serial doesn't work: Linux, GRUB and userspace sees it, but a remote computer doesn't see any output. Change-Id: I78389dc1fd19a2354daec0484042940cf8b490ae Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- src/mainboard/asus/f2a85-m_pro/BiosCallOuts.c | 1 + src/mainboard/asus/f2a85-m_pro/Kconfig | 93 +++++++++++++ src/mainboard/asus/f2a85-m_pro/Kconfig.name | 2 + src/mainboard/asus/f2a85-m_pro/Makefile.inc | 26 ++++ src/mainboard/asus/f2a85-m_pro/OptionsIds.h | 1 + src/mainboard/asus/f2a85-m_pro/PlatformGnbPcie.c | 1 + .../asus/f2a85-m_pro/PlatformGnbPcieComplex.h | 1 + src/mainboard/asus/f2a85-m_pro/acpi/AmdImc.asl | 1 + src/mainboard/asus/f2a85-m_pro/acpi/cpstate.asl | 1 + src/mainboard/asus/f2a85-m_pro/acpi/gpe.asl | 1 + src/mainboard/asus/f2a85-m_pro/acpi/mainboard.asl | 1 + src/mainboard/asus/f2a85-m_pro/acpi/routing.asl | 1 + src/mainboard/asus/f2a85-m_pro/acpi/sata.asl | 1 + src/mainboard/asus/f2a85-m_pro/acpi/si.asl | 1 + src/mainboard/asus/f2a85-m_pro/acpi/sleep.asl | 1 + src/mainboard/asus/f2a85-m_pro/acpi/superio.asl | 16 +++ src/mainboard/asus/f2a85-m_pro/acpi/thermal.asl | 1 + src/mainboard/asus/f2a85-m_pro/acpi/usb_oc.asl | 1 + src/mainboard/asus/f2a85-m_pro/acpi_tables.c | 1 + src/mainboard/asus/f2a85-m_pro/board_info.txt | 7 + src/mainboard/asus/f2a85-m_pro/buildOpts.c | 1 + src/mainboard/asus/f2a85-m_pro/cmos.layout | 79 +++++++++++ src/mainboard/asus/f2a85-m_pro/devicetree.cb | 146 +++++++++++++++++++++ src/mainboard/asus/f2a85-m_pro/dsdt.asl | 1 + src/mainboard/asus/f2a85-m_pro/irq_tables.c | 1 + src/mainboard/asus/f2a85-m_pro/mainboard.c | 1 + src/mainboard/asus/f2a85-m_pro/mptable.c | 1 + src/mainboard/asus/f2a85-m_pro/romstage.c | 134 +++++++++++++++++++ 28 files changed, 523 insertions(+) diff --git a/src/mainboard/asus/f2a85-m_pro/BiosCallOuts.c b/src/mainboard/asus/f2a85-m_pro/BiosCallOuts.c new file mode 100644 index 0000000..afa69bb --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/BiosCallOuts.c @@ -0,0 +1 @@ +#include "../f2a85-m/BiosCallOuts.c" diff --git a/src/mainboard/asus/f2a85-m_pro/Kconfig b/src/mainboard/asus/f2a85-m_pro/Kconfig new file mode 100644 index 0000000..4353444 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/Kconfig @@ -0,0 +1,93 @@ +# +# This file is part of the coreboot project. +# +# Copyright (C) 2012 Advanced Micro Devices, Inc. +# Copyright (C) 2012 Rudolf Marek <r.marek(a)assembler.cz> +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc. +# + +if BOARD_ASUS_F2A85_M_PRO + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select CPU_AMD_AGESA_FAMILY15_TN + select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN + select SOUTHBRIDGE_AMD_AGESA_HUDSON + select HAVE_OPTION_TABLE + select HAVE_PIRQ_TABLE + select HAVE_MP_TABLE + select HAVE_ACPI_TABLES + select SUPERIO_NUVOTON_NCT6779D + select BOARD_ROMSIZE_KB_8192 + select GFXUMA + select HUDSON_DISABLE_IMC + +choice + prompt "DDR3 memory voltage" + default BOARD_ASUS_F2A85_M_PRO_DDR3_VOLT_150 + +config BOARD_ASUS_F2A85_M_PRO_DDR3_VOLT_135 + bool "1.35V" + help + Set DRR3 memory voltage to 1.35V +config BOARD_ASUS_F2A85_M_PRO_DDR3_VOLT_150 + bool "1.50V" + help + Set DRR3 memory voltage to 1.50V +config BOARD_ASUS_F2A85_M_PRO_DDR3_VOLT_165 + bool "1.65V" + help + Set DRR3 memory voltage to 1.65V +endchoice + +config BOARD_ASUS_F2A85_M_DDR3_VOLT_VAL + hex + default 0x9e if BOARD_ASUS_F2A85_M_PRO_DDR3_VOLT_135 + default 0x0 if BOARD_ASUS_F2A85_M_PRO_DDR3_VOLT_150 + default 0x1e if BOARD_ASUS_F2A85_M_PRO_DDR3_VOLT_165 + +config MAINBOARD_DIR + string + default asus/f2a85-m_pro + +config MAINBOARD_PART_NUMBER + string + default "F2A85-M_PRO" + +config HW_MEM_HOLE_SIZEK + hex + default 0x200000 + +config MAX_CPUS + int + default 4 + +config HW_MEM_HOLE_SIZE_AUTO_INC + bool + default n + +config IRQ_SLOT_COUNT + int + default 11 + +config ONBOARD_VGA_IS_PRIMARY + bool + default y + +config VGA_BIOS_ID + string + default "1002,9993" + +endif # BOARD_ASUS_F2A85_M_PRO diff --git a/src/mainboard/asus/f2a85-m_pro/Kconfig.name b/src/mainboard/asus/f2a85-m_pro/Kconfig.name new file mode 100644 index 0000000..e4b8dfd --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_ASUS_F2A85_M_PRO + bool "F2A85-M PRO" diff --git a/src/mainboard/asus/f2a85-m_pro/Makefile.inc b/src/mainboard/asus/f2a85-m_pro/Makefile.inc new file mode 100644 index 0000000..0008d6d --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/Makefile.inc @@ -0,0 +1,26 @@ +# +# This file is part of the coreboot project. +# +# Copyright (C) 2012 Advanced Micro Devices, 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc. +# + +romstage-y += buildOpts.c +romstage-y += BiosCallOuts.c +romstage-y += PlatformGnbPcie.c + +ramstage-y += buildOpts.c +ramstage-y += BiosCallOuts.c +ramstage-y += PlatformGnbPcie.c diff --git a/src/mainboard/asus/f2a85-m_pro/OptionsIds.h b/src/mainboard/asus/f2a85-m_pro/OptionsIds.h new file mode 100644 index 0000000..c702a9c --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/OptionsIds.h @@ -0,0 +1 @@ +#include "../f2a85-m/OptionsIds.h" diff --git a/src/mainboard/asus/f2a85-m_pro/PlatformGnbPcie.c b/src/mainboard/asus/f2a85-m_pro/PlatformGnbPcie.c new file mode 100644 index 0000000..d83a779 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/PlatformGnbPcie.c @@ -0,0 +1 @@ +#include "../f2a85-m/PlatformGnbPcie.c" diff --git a/src/mainboard/asus/f2a85-m_pro/PlatformGnbPcieComplex.h b/src/mainboard/asus/f2a85-m_pro/PlatformGnbPcieComplex.h new file mode 100644 index 0000000..f6f4c9a --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/PlatformGnbPcieComplex.h @@ -0,0 +1 @@ +#include "../f2a85-m/PlatformGnbPcieComplex.h" diff --git a/src/mainboard/asus/f2a85-m_pro/acpi/AmdImc.asl b/src/mainboard/asus/f2a85-m_pro/acpi/AmdImc.asl new file mode 100644 index 0000000..43c2428 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi/AmdImc.asl @@ -0,0 +1 @@ +#include "../../f2a85-m/acpi/AmdImc.asl" diff --git a/src/mainboard/asus/f2a85-m_pro/acpi/cpstate.asl b/src/mainboard/asus/f2a85-m_pro/acpi/cpstate.asl new file mode 100644 index 0000000..29c8d69 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi/cpstate.asl @@ -0,0 +1 @@ +#include "../../f2a85-m/acpi/cpstate.asl" diff --git a/src/mainboard/asus/f2a85-m_pro/acpi/gpe.asl b/src/mainboard/asus/f2a85-m_pro/acpi/gpe.asl new file mode 100644 index 0000000..4794311 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi/gpe.asl @@ -0,0 +1 @@ +#include "../../f2a85-m/acpi/gpe.asl" diff --git a/src/mainboard/asus/f2a85-m_pro/acpi/mainboard.asl b/src/mainboard/asus/f2a85-m_pro/acpi/mainboard.asl new file mode 100644 index 0000000..f81742e --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi/mainboard.asl @@ -0,0 +1 @@ +#include "../../f2a85-m/acpi/mainboard.asl" diff --git a/src/mainboard/asus/f2a85-m_pro/acpi/routing.asl b/src/mainboard/asus/f2a85-m_pro/acpi/routing.asl new file mode 100644 index 0000000..77a1f8a --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi/routing.asl @@ -0,0 +1 @@ +#include "../../f2a85-m/acpi/routing.asl" diff --git a/src/mainboard/asus/f2a85-m_pro/acpi/sata.asl b/src/mainboard/asus/f2a85-m_pro/acpi/sata.asl new file mode 100644 index 0000000..46bc2e6 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi/sata.asl @@ -0,0 +1 @@ +#include "../../f2a85-m/acpi/sata.asl" diff --git a/src/mainboard/asus/f2a85-m_pro/acpi/si.asl b/src/mainboard/asus/f2a85-m_pro/acpi/si.asl new file mode 100644 index 0000000..208e5c4 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi/si.asl @@ -0,0 +1 @@ +#include "../../f2a85-m/acpi/si.asl" diff --git a/src/mainboard/asus/f2a85-m_pro/acpi/sleep.asl b/src/mainboard/asus/f2a85-m_pro/acpi/sleep.asl new file mode 100644 index 0000000..67e4e2b --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi/sleep.asl @@ -0,0 +1 @@ +#include "../../f2a85-m/acpi/sleep.asl" diff --git a/src/mainboard/asus/f2a85-m_pro/acpi/superio.asl b/src/mainboard/asus/f2a85-m_pro/acpi/superio.asl new file mode 100644 index 0000000..6f95a8a --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi/superio.asl @@ -0,0 +1,16 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2013 Sage Electronic Engineering, LLC + * + * 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. + */ + +/* No Super I/O device or functionality yet */ diff --git a/src/mainboard/asus/f2a85-m_pro/acpi/thermal.asl b/src/mainboard/asus/f2a85-m_pro/acpi/thermal.asl new file mode 100644 index 0000000..3d529e5 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi/thermal.asl @@ -0,0 +1 @@ +#include "../../f2a85-m/acpi/thermal.asl" diff --git a/src/mainboard/asus/f2a85-m_pro/acpi/usb_oc.asl b/src/mainboard/asus/f2a85-m_pro/acpi/usb_oc.asl new file mode 100644 index 0000000..1b3fba0 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi/usb_oc.asl @@ -0,0 +1 @@ +include "../../f2a85-m/acpi/usb_oc.asl" diff --git a/src/mainboard/asus/f2a85-m_pro/acpi_tables.c b/src/mainboard/asus/f2a85-m_pro/acpi_tables.c new file mode 100644 index 0000000..febb723 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/acpi_tables.c @@ -0,0 +1 @@ +#include "../f2a85-m/acpi_tables.c" diff --git a/src/mainboard/asus/f2a85-m_pro/board_info.txt b/src/mainboard/asus/f2a85-m_pro/board_info.txt new file mode 100644 index 0000000..52c5819 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/board_info.txt @@ -0,0 +1,7 @@ +Category: desktop +Board URL: http://www.asus.com/Motherboards/F2A85M_PRO/ +ROM package: DIP8 +ROM protocol: SPI +ROM socketed: y +Flashrom support: y +Release year: diff --git a/src/mainboard/asus/f2a85-m_pro/buildOpts.c b/src/mainboard/asus/f2a85-m_pro/buildOpts.c new file mode 100644 index 0000000..c9fc086 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/buildOpts.c @@ -0,0 +1 @@ +#include "../f2a85-m/buildOpts.c" diff --git a/src/mainboard/asus/f2a85-m_pro/cmos.layout b/src/mainboard/asus/f2a85-m_pro/cmos.layout new file mode 100644 index 0000000..50750a8 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/cmos.layout @@ -0,0 +1,79 @@ +#***************************************************************************** +# +# This file is part of the coreboot project. +# +# Copyright (C) 2012 Advanced Micro Devices, 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc. +#***************************************************************************** + +entries + +0 384 r 0 reserved_memory +384 1 e 4 boot_option +385 1 e 4 last_boot +388 4 r 0 reboot_bits +392 3 e 5 baud_rate +395 1 e 1 hw_scrubber +396 1 e 1 interleave_chip_selects +397 2 e 8 max_mem_clock +399 1 e 2 multi_core +400 1 e 1 power_on_after_fail +412 4 e 6 debug_level +440 4 e 9 slow_cpu +444 1 e 1 nmi +445 1 e 1 iommu +456 1 e 1 ECC_memory +728 256 h 0 user_data +984 16 h 0 check_sum +# Reserve the extended AMD configuration registers +1000 24 r 0 amd_reserved + +enumerations + +#ID value text +1 0 Disable +1 1 Enable +2 0 Enable +2 1 Disable +4 0 Fallback +4 1 Normal +5 0 115200 +5 1 57600 +5 2 38400 +5 3 19200 +5 4 9600 +5 5 4800 +5 6 2400 +5 7 1200 +6 6 Notice +6 7 Info +6 8 Debug +6 9 Spew +8 0 400Mhz +8 1 333Mhz +8 2 266Mhz +8 3 200Mhz +9 0 off +9 1 87.5% +9 2 75.0% +9 3 62.5% +9 4 50.0% +9 5 37.5% +9 6 25.0% +9 7 12.5% + +checksums + +checksum 392 983 984 diff --git a/src/mainboard/asus/f2a85-m_pro/devicetree.cb b/src/mainboard/asus/f2a85-m_pro/devicetree.cb new file mode 100644 index 0000000..34a57a9 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/devicetree.cb @@ -0,0 +1,146 @@ +# +# This file is part of the coreboot project. +# +# Copyright (C) 2012 Advanced Micro Devices, 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc. +# +chip northbridge/amd/agesa/family15tn/root_complex + + device cpu_cluster 0 on + chip cpu/amd/agesa/family15tn + device lapic 10 on end + end + end + + device domain 0 on + subsystemid 0x1022 0x1410 inherit + chip northbridge/amd/agesa/family15tn # CPU side of HT root complex + + chip northbridge/amd/agesa/family15tn # PCI side of HT root complex + device pci 0.0 on end # Root Complex + device pci 1.0 on end # Internal Graphics P2P bridge 0x99XX + device pci 1.1 on end # Internal Multimedia + device pci 2.0 on end # PCIE SLOT0 x16 blue + device pci 3.0 on end # unused? + device pci 4.0 on end # PCIE 4x black + device pci 5.0 on end # unused? + device pci 6.0 on end # unused? + device pci 7.0 on end # LAN + device pci 8.0 on end # NB/SB Link P2P bridge + end #chip northbridge/amd/agesa/family15tn # PCI side of HT root complex + + chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus + device pci 10.0 on end # XHCI HC0 + device pci 10.1 on end # XHCI HC1 + device pci 11.0 on end # SATA + device pci 12.0 on end # USB + device pci 12.2 on end # USB + device pci 13.0 on end # USB + device pci 13.2 on end # USB + device pci 14.0 on # SMBUS + chip drivers/generic/generic #dimm 0 + device i2c 50 on end # 7-bit SPD address + end + chip drivers/generic/generic #dimm 1 + device i2c 51 on end # 7-bit SPD address + end + end # SM + device pci 14.1 on end # IDE 0x439c + device pci 14.2 on end # HDA 0x4383 + device pci 14.3 on # LPC 0x439d + chip superio/nuvoton/nct5572d + device pnp 2e.0 off end # FDC + device pnp 2e.1 off end # LPT1 + device pnp 2e.2 on # COM1 + io 0x60 = 0x3f8 + irq 0x70 = 4 + end + device pnp 2e.3 off end # COM2/IR + device pnp 2e.5 off end # Keyboard + device pnp 2e.6 off end # CIR + device pnp 2e.7 on # GPIO6, GPIO7, GPIO8 + io 0xe0 = 0x7f + io 0xe1 = 0x10 + io 0xe5 = 0xff + io 0xe6 = 0xff + io 0xe7 = 0xff + io 0xed = 0xff + io 0xf5 = 0xff + end + device pnp 2e.8 on # WDT1, GPIO0, GPIO1 + io 0x30 = 0x02 + io 0xe1 = 0x80 + io 0xf1 = 0x28 + io 0xf4 = 0x08 + io 0xf5 = 0xff + io 0xf7 = 0xff + end + device pnp 2e.9 on # GPIO1, GPIO2, GPIO3, GPIO4, GPIO5, GPIO6, GPIO7, GPIO8 + io 0x30 = 0xfe + io 0xe1 = 0x90 + io 0xe5 = 0x76 + io 0xf1 = 0x7b + io 0xf5 = 0xff + end + device pnp 2e.a on # ACPI + io 0xe6 = 0x5c + io 0xe7 = 0x11 + io 0xf2 = 0x5d + end + device pnp 2e.b on # Hardware Monitor, Front Panel LED + io 0x30 = 0x01 + io 0x60 = 0x02 + io 0x61 = 0x90 + io 0xe2 = 0x7f + io 0xe4 = 0xf1 + end + device pnp 2e.d off end # WDT1 + device pnp 2e.e off end # CIR WAKE-UP + device pnp 2e.f off # GPIO Push-pull/Open-drain selection + io 0xe6 = 7f + end + device pnp 2e.14 off # PORT80 UART + io 0xe0 = 0x00 + end + device pnp 2e.16 off end # Deep Sleep + end + end #device pci 14.3 # LPC + device pci 14.4 on end # PCI 0x4384 + device pci 14.5 on end # USB 2 + device pci 14.6 on end # Gec + device pci 14.7 on end # SD + device pci 15.0 on end # PCIe 0 - onboard PCIe 1x + device pci 15.1 on end # PCIe 1 onboard gigabit + device pci 15.2 on end # unused + device pci 15.3 on end # unused + + end #chip southbridge/amd/hudson + + device pci 18.0 on end + device pci 18.1 on end + device pci 18.2 on end + device pci 18.3 on end + device pci 18.4 on end + device pci 18.5 on end + + register "spdAddrLookup" = " + { + { {0xA0, 0xA4}, {0xA2, 0xA6}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses + { {0x00, 0x00}, {0x00, 0x00}, }, // socket 1 - Channel 0 & 1 - 8-bit SPD addresses + }" + + end #chip northbridge/amd/agesa/family15tn # CPU side of HT root complex + end #domain +end #chip northbridge/amd/agesa/family15tn/root_complex diff --git a/src/mainboard/asus/f2a85-m_pro/dsdt.asl b/src/mainboard/asus/f2a85-m_pro/dsdt.asl new file mode 100644 index 0000000..b27b81d --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/dsdt.asl @@ -0,0 +1 @@ +#include "../f2a85-m/dsdt.asl" diff --git a/src/mainboard/asus/f2a85-m_pro/irq_tables.c b/src/mainboard/asus/f2a85-m_pro/irq_tables.c new file mode 100644 index 0000000..7e6c693 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/irq_tables.c @@ -0,0 +1 @@ +#include "../f2a85-m/irq_tables.c" diff --git a/src/mainboard/asus/f2a85-m_pro/mainboard.c b/src/mainboard/asus/f2a85-m_pro/mainboard.c new file mode 100644 index 0000000..d8cc9c8 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/mainboard.c @@ -0,0 +1 @@ +#include "../f2a85-m/mainboard.c" diff --git a/src/mainboard/asus/f2a85-m_pro/mptable.c b/src/mainboard/asus/f2a85-m_pro/mptable.c new file mode 100644 index 0000000..1d0784d --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/mptable.c @@ -0,0 +1 @@ +#include <mainboard/asus/f2a85-m/mptable.c> diff --git a/src/mainboard/asus/f2a85-m_pro/romstage.c b/src/mainboard/asus/f2a85-m_pro/romstage.c new file mode 100644 index 0000000..001bae4 --- /dev/null +++ b/src/mainboard/asus/f2a85-m_pro/romstage.c @@ -0,0 +1,134 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2012 Advanced Micro Devices, Inc. + * Copyright (C) 2012 Rudolf Marek <r.marek(a)assembler.cz> + * + * 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 <northbridge/amd/agesa/agesawrapper.h> + +#include <arch/acpi.h> +#include <arch/cpu.h> +#include <arch/io.h> +#include <arch/stages.h> +#include <cbmem.h> +#include <console/console.h> +#include <cpu/amd/agesa/s3_resume.h> +#include <cpu/amd/car.h> +#include <cpu/x86/bist.h> +#include <cpu/x86/lapic.h> +#include <device/pci_def.h> +#include <device/pci_ids.h> +#include <device/pnp_def.h> +#include <southbridge/amd/agesa/hudson/hudson.h> +#include <southbridge/amd/agesa/hudson/smbus.h> +#include <superio/nuvoton/common/nuvoton.h> +#include <superio/nuvoton/nct6779d/nct6779d.h> +#include <stdint.h> +#include <string.h> + +#define MMIO_NON_POSTED_START 0xfed00000 +#define MMIO_NON_POSTED_END 0xfedfffff +#define SB_MMIO 0xFED80000 +#define SB_MMIO_MISC32(x) *(volatile u32 *)(SB_MMIO + 0xE00 + (x)) + +#define SERIAL_DEV PNP_DEV(0x2e, NCT6779D_SP1) + +void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) +{ + u32 val; + u8 byte; + device_t dev; + +#if IS_ENABLED(CONFIG_POST_DEVICE_PCI_PCIE) + hudson_pci_port80(); +#endif +#if IS_ENABLED(CONFIG_POST_DEVICE_LPC) + hudson_lpc_port80(); +#endif + + amd_initmmio(); + + if (!cpu_init_detectedx && boot_cpu()) { + + /* enable SIO LPC decode */ + dev = PCI_DEV(0, 0x14, 3); + byte = pci_read_config8(dev, 0x48); + byte |= 3; /* 2e, 2f */ + pci_write_config8(dev, 0x48, byte); + + /* enable serial decode */ + byte = pci_read_config8(dev, 0x44); + byte |= (1 << 6); /* 0x3f8 */ + pci_write_config8(dev, 0x44, byte); + + post_code(0x30); + + /* enable SB MMIO space */ + outb(0x24, 0xcd6); + outb(0x1, 0xcd7); + + nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + console_init(); + + /* turn on secondary smbus at b20 */ + outb(0x28, 0xcd6); + byte = inb(0xcd7); + byte |= 1; + outb(byte, 0xcd7); + + /* set DDR3 voltage */ + byte = CONFIG_BOARD_ASUS_F2A85_M_DDR3_VOLT_VAL; + + /* default is byte = 0x0, so no need to set it in this case */ + if (byte) + do_smbus_write_byte(0xb20, 0x15, 0x3, byte); + } + + /* Halt if there was a built in self test failure */ + post_code(0x34); + report_bist_failure(bist); + + /* Load MPB */ + val = cpuid_eax(1); + printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val); + printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx); + + post_code(0x37); + agesawrapper_amdinitreset(); + post_code(0x39); + + agesawrapper_amdinitearly(); + int s3resume = acpi_is_wakeup_s3(); + if (!s3resume) { + post_code(0x40); + agesawrapper_amdinitpost(); + post_code(0x41); + agesawrapper_amdinitenv(); + disable_cache_as_ram(); + } else { /* S3 detect */ + printk(BIOS_INFO, "S3 detected\n"); + + post_code(0x60); + agesawrapper_amdinitresume(); + amd_initcpuio(); + agesawrapper_amds3laterestore(); + + post_code(0x61); + prepare_for_resume(); + } + + post_code(0x50); + copy_and_run(); + + post_code(0x54); /* Should never see this post code. */ +}

1 0

New patch to review for coreboot: nvramtool: Print computed and stored checksum in case of mismatch.
by Denis Carikli 23 Feb '16

23 Feb '16

Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13770 -gerrit commit ed460dd687f69d0d3fe9290f92714eea27e68169 Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Sat Feb 20 18:49:13 2016 +0100 nvramtool: Print computed and stored checksum in case of mismatch. This is to make it easier to fix checksum issues. Example: # nvramtool -a [...] nvramtool: Warning: Coreboot CMOS checksum is bad. Computed checksum: 0xfa. Stored checksum: 0x0 # nvramtool -c 0xfa Change-Id: Ifacb68b5693afbdfcb521acd6937e270ead85186 Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- util/nvramtool/cmos_ops.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/nvramtool/cmos_ops.c b/util/nvramtool/cmos_ops.c index 8873633..6f616a0 100644 --- a/util/nvramtool/cmos_ops.c +++ b/util/nvramtool/cmos_ops.c @@ -229,6 +229,8 @@ void cmos_checksum_verify(void) if (computed != actual) { fprintf(stderr, "%s: Warning: Coreboot CMOS checksum is bad.\n", prog_name); + fprintf(stderr, "Computed checksum: 0x%x. Stored checksum: 0x%x\n", + computed, actual); exit(1); } }

1 0

Patch merged into coreboot/master: board_status.sh: Allow user to override coreboot image path
by gerrit＠coreboot.org 23 Feb '16

23 Feb '16

the following patch was just integrated into master: commit 1173bf30fa174f9ae32551223660b1b0f0082cec Author: David Hendricks <dhendrix(a)chromium.org> Date: Thu Nov 19 13:04:27 2015 -0800 board_status.sh: Allow user to override coreboot image path Some users may wish to run this script using a coreboot image that does get built in the usual build/ directory, for example if abuild is used to generate the image. Change-Id: I7e98780f8b7b57ebbf3babd6a289f0e4fd4103d8 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Reviewed-on: https://review.coreboot.org/12489 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See https://review.coreboot.org/12489 for details. -gerrit

1 0

Patch set updated for coreboot: payloads: Load coreinfo as a secondary payload
by Martin Roth 23 Feb '16

23 Feb '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13728 -gerrit commit 6108e3ee9e5f1b765ff4b26b81b4f81dd0dbb6f8 Author: Martin Roth <martinroth(a)google.com> Date: Tue Feb 16 19:40:47 2016 -0700 payloads: Load coreinfo as a secondary payload This allows coreinfo to be added to CBFS as a 'secondary' payload on x86 systems, to be loaded by the main payload if desired. Change-Id: I52661d486823bc4bb215ce92dca118c9d2c2a309 Signed-off-by: Martin Roth <martinroth(a)google.com> --- Makefile.inc | 2 +- payloads/Kconfig | 9 ++++++++- payloads/Makefile.inc | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 1889128..68012d9 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -74,7 +74,7 @@ subdirs-y += util/cbfstool util/sconfig util/nvramtool util/broadcom subdirs-y += util/futility util/marvell subdirs-y += $(wildcard src/arch/*) subdirs-y += src/mainboard/$(MAINBOARDDIR) -subdirs-y += payloads/external +subdirs-y += payloads payloads/external subdirs-y += site-local diff --git a/payloads/Kconfig b/payloads/Kconfig index 9037b30..01bd216 100644 --- a/payloads/Kconfig +++ b/payloads/Kconfig @@ -59,5 +59,12 @@ config PAYLOAD_IS_FLAT_BINARY Add the payload to cbfs as a flat binary type instead of as an elf payload -endmenu +config COREINFO_SECONDARY_PAYLOAD + bool "Load coreinfo as a secondary payload" + default n + depends on ARCH_X86 + help + coreinfo can be loaded as a secondary payload under SeaBIOS, GRUB, + or any other payload that can load additional payloads. +endmenu diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc new file mode 100644 index 0000000..1bd8cf7 --- /dev/null +++ b/payloads/Makefile.inc @@ -0,0 +1,21 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2016 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. +## + +cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo +img/coreinfo-file := payloads/coreinfo/build/coreinfo.elf +img/coreinfo-type := payload + +payloads/coreinfo/build/coreinfo.elf coreinfo: + $(MAKE) -C payloads/coreinfo defaultbuild

1 0

Patch set updated for coreboot: cbfstool: Makefile: Add install target
by Denis Carikli 23 Feb '16

23 Feb '16

Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12403 -gerrit commit ae29cb5a057321fcc416a599bef07abdd2a9f559 Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Wed Nov 11 05:27:25 2015 +0100 cbfstool: Makefile: Add install target Change-Id: I5df7033e1e52c78e97cdbd26aef2d7824ea67f8b Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- util/cbfstool/Makefile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index 61a1a63..60a8d24 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -3,11 +3,15 @@ objutil ?= $(top)/util CONFIG_FMD_GENPARSER := y -HOSTCC ?= $(CC) +HOSTCC ?= $(CC) +PREFIX ?= /usr/local +INSTALL ?= /usr/bin/install OBJCOPY ?= objcopy -.PHONY: all -all: $(objutil)/cbfstool/cbfstool \ +all: cbfstool + +.PHONY: cbfstool +cbfstool: $(objutil)/cbfstool/cbfstool \ $(objutil)/cbfstool/fmaptool \ $(objutil)/cbfstool/rmodtool \ @@ -27,6 +31,13 @@ linux_trampoline.c: linux_trampoline.S mv trampoline.c linux_trampoline.c rm linux_trampoline trampoline +.PHONY: install +install: cbfstool + mkdir -p $(DESTDIR)$(PREFIX)/bin + $(INSTALL) cbfstool $(DESTDIR)$(PREFIX)/bin + $(INSTALL) fmaptool $(DESTDIR)$(PREFIX)/bin + $(INSTALL) rmodtool $(DESTDIR)$(PREFIX)/bin + .SILENT: include Makefile.inc

1 0

New patch to review for coreboot: cbfstool: Silence LZ4 -Wsign-compare warnings
by Julius Werner 23 Feb '16

23 Feb '16

Julius Werner (jwerner(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13769 -gerrit commit 042701b613183c3b77c2a880a4dc2ecc1558b22e Author: Julius Werner <jwerner(a)chromium.org> Date: Mon Feb 22 15:30:37 2016 -0800 cbfstool: Silence LZ4 -Wsign-compare warnings It seems that the exact behavior of -Wsign-compare changes between GCC versions... some of them like the commonlib/lz4_wrapper.c code, and some don't. Since we don't have a well-defined HOSTCC toolchain this slipped through pre-commit testing. Explicitly silence the warning to ensure cbfstool still builds on all systems. Change-Id: I43f951301d3f14ce34dadbe58e885b82d21d6353 Signed-off-by: Julius Werner <jwerner(a)chromium.org> --- util/cbfstool/Makefile.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index f480616..8824ad0 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -150,6 +150,7 @@ $(objutil)/cbfstool/cbfs.o: TOOLCFLAGS += -Wno-sign-compare -Wno-cast-qual $(objutil)/cbfstool/mem_pool.o: TOOLCFLAGS += -Wno-sign-compare -Wno-cast-qual # Tolerate lz4 warnings $(objutil)/cbfstool/lz4.o: TOOLCFLAGS += -Wno-missing-prototypes +$(objutil)/cbfstool/lz4_wrapper.o: TOOLCFLAGS += -Wno-sign-compare $(objutil)/cbfstool/fmd.o: $(objutil)/cbfstool/fmd_parser.h $(objutil)/cbfstool/fmd.o: $(objutil)/cbfstool/fmd_scanner.h

1 0

Patch merged into coreboot/master: southbridge/intel/ibexpeak: Use common gpio.c
by gerrit＠coreboot.org 23 Feb '16

23 Feb '16

the following patch was just integrated into master: commit 10104685c50d05353318932f183864f3fca37489 Author: Patrick Rudolph <siro(a)das-labor.org> Date: Sat Feb 6 18:12:28 2016 +0100 southbridge/intel/ibexpeak: Use common gpio.c Use shared gpio code from common folder. Remove the now unused bd82x6x/gpio.c. Needs test on real hardware ! Change-Id: Ibb54c03fd83a529d1ceccfb2c33190e7d42224d8 Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> Reviewed-on: https://review.coreboot.org/13616 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth(a)google.com> See https://review.coreboot.org/13616 for details. -gerrit

1 0

Patch merged into coreboot/master: southbridge/intel/lynxpoint: Use common gpio.c
by gerrit＠coreboot.org 23 Feb '16

23 Feb '16

the following patch was just integrated into master: commit 273a8dca1f7896c73b812ecc2c6cd2572ac51d6a Author: Patrick Rudolph <siro(a)das-labor.org> Date: Sat Feb 6 18:07:59 2016 +0100 southbridge/intel/lynxpoint: Use common gpio.c Use shared gpio code from common folder, except for INTEL_LYNXPOINT_LP, which has it's own gpio code. Needs test on real hardware ! Change-Id: Iccc6d254bafb927b6470704cec7c9dd7528e2c68 Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> Reviewed-on: https://review.coreboot.org/13615 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth(a)google.com> See https://review.coreboot.org/13615 for details. -gerrit

1 0

Patch set updated for coreboot: util: Add a very simple utility to test POST cards.
by Denis Carikli 22 Feb '16

22 Feb '16

Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13763 -gerrit commit 17a50b4145ff9ad5a8cba01f7abbdbef740c6193 Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Sun Feb 21 14:27:21 2016 +0100 util: Add a very simple utility to test POST cards. It was tested with a mini-PCI POST card on a Toshiba Satellite 1410 laptop with the stock BIOS. Change-Id: Icdc0860e2c72b17862601c2cc59eaf0f3d8a0e54 Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- util/post/.gitignore | 1 + util/post/Makefile | 4 +++ util/post/README | 1 + util/post/post.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+) diff --git a/util/post/.gitignore b/util/post/.gitignore new file mode 100644 index 0000000..8b1e502 --- /dev/null +++ b/util/post/.gitignore @@ -0,0 +1 @@ +post diff --git a/util/post/Makefile b/util/post/Makefile new file mode 100644 index 0000000..d0a3eb9 --- /dev/null +++ b/util/post/Makefile @@ -0,0 +1,4 @@ +all: + $(CC) post.c -o post +clean: + rm -f post diff --git a/util/post/README b/util/post/README new file mode 100644 index 0000000..95b33a9 --- /dev/null +++ b/util/post/README @@ -0,0 +1 @@ +This is a very simple userspace utility that can be used to test POST cards. diff --git a/util/post/post.c b/util/post/post.c new file mode 100644 index 0000000..6d67909 --- /dev/null +++ b/util/post/post.c @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2016 Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> + * + * 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; either version 2 of the License, or + * (at your option) any later version. + * + * 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 <errno.h> +#include <limits.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/io.h> + +#define POST_DEFAULT_IO_PORT 0x80 + +void usage(char *progname, const char *error, ...) +{ + printf("Usage: %s <VALUE> [PORT]\n", progname); + printf("The VALUE argument is an integer between 0x00 and 0xff\n"); + printf("The PORT argument is an integer between 0x00 and 0xffff\n"); + + if (error) { + va_list args; + + va_start(args, error); + vprintf(error, args); + va_end(args); + }; +} + +void check_int(long val, int min, int max, int err, char *string, char *endptr, + char *progname) +{ + if (val < min || val > max) { + usage(progname, + "\nError: The value has to be between 0x%x and 0x%x\n", + min, max); + exit(EXIT_FAILURE); + } + + if (endptr == string || *endptr != '\0') { + usage(progname, "\nError: An integer is required\n"); + exit(EXIT_FAILURE); + } + + if ((err) && (!val)) { + perror("strtol"); + exit(EXIT_FAILURE); + } +} + +int main(int argc, char *argv[]) +{ + unsigned long val; + unsigned long port = POST_DEFAULT_IO_PORT; + char *endptr; + int err; + + if (argc != 2 && argc != 3) { + usage(argv[0], NULL); + exit(EXIT_FAILURE); + } + + val = strtol(argv[1], &endptr, 0); + err = errno; + check_int(val, 0x00, 0xff, err, argv[1], endptr, argv[0]); + + if (argc > 2) { + port = strtol(argv[2], &endptr, 0); + err = errno; + check_int(port, 0x0000, 0xffff, err, argv[2], endptr, argv[0]); + } + + err = iopl(3); + if (err == -1) { + perror("Not root"); + exit(EXIT_FAILURE); + } + + outb(val, port); + + return 0; +}

1 0

New patch to review for coreboot: u-boot: Make sure targets aren't duplicated
by Martin Roth 22 Feb '16

22 Feb '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13767 -gerrit commit 4aed215643cb8f2bfc95939df55366bb5b75ff06 Author: Martin Roth <martinroth(a)google.com> Date: Mon Feb 22 14:03:13 2016 -0800 u-boot: Make sure targets aren't duplicated When U-Boot isn't selected as a payload, two of the targets: $(project_dir): and $(project_dir)/$(TAG-y) evaluated to the same value, generating a make warning when running a clean. By adding additional text to the file that is created, this is avoided. Change-Id: I4b4df753612b674b3ccde2a757338840be92d1f2 Signed-off-by: Martin Roth <martinroth(a)google.com> --- payloads/external/U-Boot/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payloads/external/U-Boot/Makefile.inc b/payloads/external/U-Boot/Makefile.inc index f0abee1..255db29 100644 --- a/payloads/external/U-Boot/Makefile.inc +++ b/payloads/external/U-Boot/Makefile.inc @@ -50,7 +50,7 @@ else touch $(project_dir)/$(STABLE_COMMIT_ID) endif -$(project_dir)/$(TAG-y): fetch +$(project_dir)/tag-$(TAG-y): fetch echo " Checking out $(project_name) revision $(TAG-y)" cd $(project_dir); git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y) @@ -58,7 +58,7 @@ config: $(project_dir)/$(TAG-y) rm -f $(project_config_file) ifneq ($(CONFIG_PAYLOAD_CONFIGFILE),) ifneq ("$(wildcard $(CONFIG_PAYLOAD_CONFIGFILE))","") - cat $(CONFIG_PAYLOAD_CONFIGFILE)" > $(project_config_file) + cat $(CONFIG_PAYLOAD_CONFIGFILE)" > tag-$(project_config_file) else echo "Error: File $(CONFIG_PAYLOAD_CONFIGFILE) does not exist" false

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit February 2016