coreboot-gerrit June 2018

coreboot-gerrit@coreboot.org

1 participants
2751 discussions

Change in coreboot[master]: util/sconfig: Enable parsing of override device tree
by build bot (Jenkins) (Code Review) 24 Jun '18

24 Jun '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/26689 ) Change subject: util/sconfig: Enable parsing of override device tree ...................................................................... Patch Set 4: (1 comment) https://review.coreboot.org/#/c/26689/4/util/sconfig/main.c File util/sconfig/main.c: https://review.coreboot.org/#/c/26689/4/util/sconfig/main.c@888 PS4, Line 888: printf("usage: sconfig devicetree_file output_file [override_devicetree_file]\n"); line over 80 characters -- To view, visit https://review.coreboot.org/26689 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I477e038c8922ae1a9ed5d8bf22a5f927a19a69c7 Gerrit-Change-Number: 26689 Gerrit-PatchSet: 4 Gerrit-Owner: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 24 Jun 2018 07:24:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No

1 0

Change in coreboot[master]: util/abuild: Enable abuild to compile a single variant
by Furquan Shaikh (Code Review) 24 Jun '18

24 Jun '18

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/27215 Change subject: util/abuild: Enable abuild to compile a single variant ...................................................................... util/abuild: Enable abuild to compile a single variant There are many boards in coreboot which support multiple variants. When abuild is used to compile a single target, it builds all its variants. If a target has 5 variants, then abuild takes nearly 10x the time to compile all variants of the target. This change adds an option -b/--board-variant to enable abuild to compile only a single variant of the target. TEST=Verified: 1. abuild builds all variants of the target if -b option is not provided. 2. abuild builds a single variant if -b option is provided. 3. abuild prints appropriate error message if invalid variant name is provided. Change-Id: I3781568c6409c5ec2610a8386a21d86037428e7f Signed-off-by: Furquan Shaikh <furquan(a)google.com> --- M util/abuild/abuild 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/27215/1 diff --git a/util/abuild/abuild b/util/abuild/abuild index cebb7b7..ae4f100 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -168,8 +168,11 @@ { local targets + local VARIANT_UC=$(echo "${variant}" | tr '[:lower:]' '[:upper:]') + targets=$(get_mainboards "$1") if [ -n "$targets" ]; then + targets=$(grep "${VARIANT_UC}$" <<< ${targets}) echo "$targets" return fi @@ -537,6 +540,8 @@ Options:\n" [-a|--all] Build previously succeeded ports as well [-A|--any-toolchain] Use any toolchain + [-b|--board-variant <name>] Build specific board variant under the + given target. [-B|--blobs] Allow using binary files [--checksum <path/basefile>] Store checksums at path/basefile [-c|--cpus <numcpus>] Build on <numcpus> at the same time @@ -613,12 +618,12 @@ # shellcheck disable=SC2086 if [ "${getoptbrand:0:6}" == "getopt" ]; then # Detected GNU getopt that supports long options. - args=$(getopt -l version,verbose,quiet,help,all,target:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,any-toolchain,clean,outdir:,chromeos,xmlfile:,kconfig:,dir:,root:,recursive,checksum:,timeless,exitcode -o Vvqhat:p:c:sJCl:rP:uyBLAzo:xX:K:d:R:Ie -- "$@") || exit 1 + args=$(getopt -l version,verbose,quiet,help,all,target:,board-variant:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,any-toolchain,clean,outdir:,chromeos,xmlfile:,kconfig:,dir:,root:,recursive,checksum:,timeless,exitcode -o Vvqhat:b:p:c:sJCl:rP:uyBLAzo:xX:K:d:R:Ie -- "$@") || exit 1 eval set -- $args retval=$? else # Detected non-GNU getopt - args=$(getopt Vvqhat:p:c:sJCl:rP:uyBLAzo:xX:K:d:R:Ie "$@") + args=$(getopt Vvqhat:b:p:c:sJCl:rP:uyBLAzo:xX:K:d:R:Ie "$@") set -- $args retval=$? fi @@ -639,6 +644,7 @@ case "$1" in -J|--junit) shift; mode=junit; rm -f "$XMLFILE" ;; -t|--target) shift; target="$1"; shift;; + -b|--board-variant) shift; variant="$1"; shift;; -a|--all) shift; buildall=true;; -d|--dir) shift; configdir="$1"; shift;; -e|--exitcode) shift; exitcode=1;; @@ -829,7 +835,11 @@ # build a single board MAINBOARD=$(normalize_target "${target}") if [ -z "${MAINBOARD}" ]; then - printf "No such target: %s\n" "$target" + printf "No such target: %s" "${target}" + if [ -n "${variant}" ]; then + printf ", variant: %s" "${variant}" + fi + printf "\n" exit 1 fi build_srcdir="$(mainboard_directory "${MAINBOARD}")" -- To view, visit https://review.coreboot.org/27215 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3781568c6409c5ec2610a8386a21d86037428e7f Gerrit-Change-Number: 27215 Gerrit-PatchSet: 1 Gerrit-Owner: Furquan Shaikh <furquan(a)google.com>

1 0

Change in coreboot[master]: mb/*/*: Drop VGA_BIOS_FILE and VGA_BIOS_ID on some cases
by Nico Huber (Code Review) 23 Jun '18

23 Jun '18

Nico Huber has posted comments on this change. ( https://review.coreboot.org/27212 ) Change subject: mb/*/*: Drop VGA_BIOS_FILE and VGA_BIOS_ID on some cases ...................................................................... Patch Set 1: I just had a look at some models with soldered down CPU. They have much better odds to hit the correct number (only the more rare Core-i3 CPUs differ, AFAICS). Same for the Ivy Bridge notebooks, if you assume that nobody downgrades the CPU ;) -- To view, visit https://review.coreboot.org/27212 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b70974b47d04267770c8e91b7663450f0e2dbbb Gerrit-Change-Number: 27212 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 23 Jun 2018 18:31:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Change in coreboot[master]: mb/*/*: Drop VGA_BIOS_FILE and VGA_BIOS_ID on some cases
by Patrick Rudolph (Code Review) 23 Jun '18

23 Jun '18

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/27212 ) Change subject: mb/*/*: Drop VGA_BIOS_FILE and VGA_BIOS_ID on some cases ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/27212 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b70974b47d04267770c8e91b7663450f0e2dbbb Gerrit-Change-Number: 27212 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 23 Jun 2018 18:24:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: mb/*/*: Drop VGA_BIOS_FILE and VGA_BIOS_ID on some cases
by Nico Huber (Code Review) 23 Jun '18

23 Jun '18

Nico Huber has posted comments on this change. ( https://review.coreboot.org/27212 ) Change subject: mb/*/*: Drop VGA_BIOS_FILE and VGA_BIOS_ID on some cases ...................................................................... Patch Set 1: I inspired this work because of a simple calculation: If you override the default per mainboard you might fix loading the OPROM in SeaBIOS in 1 out of 6 cases, but break it for coreboot in 5 out of 6 (the chipset default always works in coreboot because it has a compati- bility list). What do you think, folks? -- To view, visit https://review.coreboot.org/27212 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b70974b47d04267770c8e91b7663450f0e2dbbb Gerrit-Change-Number: 27212 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 23 Jun 2018 18:16:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Change in coreboot[master]: mb/*/*: Drop VGA_BIOS_FILE and VGA_BIOS_ID on some cases
by build bot (Jenkins) (Code Review) 23 Jun '18

23 Jun '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/27212 ) Change subject: mb/*/*: Drop VGA_BIOS_FILE and VGA_BIOS_ID on some cases ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/29293/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/75234/ : SUCCESS -- To view, visit https://review.coreboot.org/27212 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b70974b47d04267770c8e91b7663450f0e2dbbb Gerrit-Change-Number: 27212 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 23 Jun 2018 17:55:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: mb/*/*: Drop VGA_BIOS_FILE and VGA_BIOS_ID on some cases
by Angel Pons (Code Review) 23 Jun '18

23 Jun '18

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/27212 Change subject: mb/*/*: Drop VGA_BIOS_FILE and VGA_BIOS_ID on some cases ...................................................................... mb/*/*: Drop VGA_BIOS_FILE and VGA_BIOS_ID on some cases If a certain mainboard does not have a specific CPU paired with it, VGA_BIOS_FILE and VGA_BIOS_ID should not be set to a CPU-specific default. The only exceptions are boards which are always paired with the same CPU model. This patch set only modifies SNB/IVB boards as of now, though the concept can be applied to other generations. Change-Id: I5b70974b47d04267770c8e91b7663450f0e2dbbb Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/mainboard/apple/macbookair4_2/Kconfig M src/mainboard/asus/maximus_iv_gene-z/Kconfig M src/mainboard/compulab/intense_pc/Kconfig M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig M src/mainboard/gigabyte/ga-b75m-d3v/Kconfig M src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig M src/mainboard/hp/2570p/Kconfig M src/mainboard/hp/2760p/Kconfig M src/mainboard/hp/8460p/Kconfig M src/mainboard/hp/8470p/Kconfig M src/mainboard/hp/compaq_8200_elite_sff/Kconfig M src/mainboard/hp/folio_9470m/Kconfig M src/mainboard/hp/revolve_810_g1/Kconfig M src/mainboard/kontron/ktqm77/Kconfig M src/mainboard/lenovo/l520/Kconfig M src/mainboard/lenovo/s230u/Kconfig M src/mainboard/lenovo/t420/Kconfig M src/mainboard/lenovo/t420s/Kconfig M src/mainboard/lenovo/t430s/Kconfig M src/mainboard/lenovo/t520/Kconfig M src/mainboard/lenovo/t530/Kconfig M src/mainboard/lenovo/x1_carbon_gen1/Kconfig M src/mainboard/lenovo/x220/Kconfig M src/mainboard/lenovo/x230/Kconfig M src/mainboard/samsung/stumpy/Kconfig M src/mainboard/sapphire/pureplatinumh61/Kconfig 26 files changed, 0 insertions(+), 187 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/27212/1 diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig index bdfe667..c87a7c0 100644 --- a/src/mainboard/apple/macbookair4_2/Kconfig +++ b/src/mainboard/apple/macbookair4_2/Kconfig @@ -31,14 +31,6 @@ string default "MacBookAir4,2" -config VGA_BIOS_FILE - string - default "pci8086,0116.rom" - -config VGA_BIOS_ID - string - default "8086,0116" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x7270 diff --git a/src/mainboard/asus/maximus_iv_gene-z/Kconfig b/src/mainboard/asus/maximus_iv_gene-z/Kconfig index eacf92e..73616d4 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/Kconfig +++ b/src/mainboard/asus/maximus_iv_gene-z/Kconfig @@ -44,10 +44,6 @@ string default "Maximus IV GENE-Z" -config VGA_BIOS_ID - string - default "8086,0112" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x844d diff --git a/src/mainboard/compulab/intense_pc/Kconfig b/src/mainboard/compulab/intense_pc/Kconfig index 557b8ff..8ccb7a7 100644 --- a/src/mainboard/compulab/intense_pc/Kconfig +++ b/src/mainboard/compulab/intense_pc/Kconfig @@ -36,10 +36,6 @@ string default "Intense-PC" -config VGA_BIOS_ID - string - default "8086,0166" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x7270 diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig index 580a9ad..6c3916e 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig +++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig @@ -39,14 +39,6 @@ int default 8 -config VGA_BIOS_ID - string - default "8086,0162" - -config VGA_BIOS_FILE - string - default "pci8086,0162.rom" - config HAVE_IFD_BIN bool default n diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig index b8694f5..f6b4072 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig +++ b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig @@ -38,14 +38,6 @@ int default 8 -config VGA_BIOS_ID - string - default "8086,0102" - -config VGA_BIOS_FILE - string - default "pci8086,0102.rom" - config HAVE_IFD_BIN bool default n diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig b/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig index f53bc06..8be54d3 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig @@ -48,14 +48,6 @@ string default "GA-H61M-S2PV" -config VGA_BIOS_FILE - string - default "pci8086,0102.rom" - -config VGA_BIOS_ID - string - default "8086,0102" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x5001 diff --git a/src/mainboard/hp/2570p/Kconfig b/src/mainboard/hp/2570p/Kconfig index dc9588b..4dc4b6e 100644 --- a/src/mainboard/hp/2570p/Kconfig +++ b/src/mainboard/hp/2570p/Kconfig @@ -50,14 +50,6 @@ string default "EliteBook 2570p" -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - -config VGA_BIOS_ID - string - default "8086,0166" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x17df diff --git a/src/mainboard/hp/2760p/Kconfig b/src/mainboard/hp/2760p/Kconfig index 7adf209..0ffc798 100644 --- a/src/mainboard/hp/2760p/Kconfig +++ b/src/mainboard/hp/2760p/Kconfig @@ -50,14 +50,6 @@ string default "EliteBook 2760p" -config VGA_BIOS_FILE - string - default "pci8086,0116.rom" - -config VGA_BIOS_ID - string - default "8086,0116" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x162a diff --git a/src/mainboard/hp/8460p/Kconfig b/src/mainboard/hp/8460p/Kconfig index 1486659..be08678 100644 --- a/src/mainboard/hp/8460p/Kconfig +++ b/src/mainboard/hp/8460p/Kconfig @@ -53,14 +53,6 @@ string default "EliteBook 8460p" -config VGA_BIOS_FILE - string - default "pci8086,0116.rom" - -config VGA_BIOS_ID - string - default "8086,0116" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x161c diff --git a/src/mainboard/hp/8470p/Kconfig b/src/mainboard/hp/8470p/Kconfig index 2157867..eed0cbe 100644 --- a/src/mainboard/hp/8470p/Kconfig +++ b/src/mainboard/hp/8470p/Kconfig @@ -51,14 +51,6 @@ string default "EliteBook 8470p" -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - -config VGA_BIOS_ID - string - default "8086,0166" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x179b diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig index 4e7062e..950b42c 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig +++ b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig @@ -34,14 +34,6 @@ string default "HP Compaq 8200 Elite SFF PC" -config VGA_BIOS_FILE - string - default "pci8086,0102.rom" - -config VGA_BIOS_ID - string - default "8086,0102" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x1495 diff --git a/src/mainboard/hp/folio_9470m/Kconfig b/src/mainboard/hp/folio_9470m/Kconfig index 188f8d8..510c273 100644 --- a/src/mainboard/hp/folio_9470m/Kconfig +++ b/src/mainboard/hp/folio_9470m/Kconfig @@ -37,14 +37,6 @@ string default "EliteBook Folio 9470m" -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - -config VGA_BIOS_ID - string - default "8086,0166" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x18df diff --git a/src/mainboard/hp/revolve_810_g1/Kconfig b/src/mainboard/hp/revolve_810_g1/Kconfig index 7816da5..896eb4c 100644 --- a/src/mainboard/hp/revolve_810_g1/Kconfig +++ b/src/mainboard/hp/revolve_810_g1/Kconfig @@ -39,14 +39,6 @@ string default "EliteBook Revolve 810 G1" -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - -config VGA_BIOS_ID - string - default "8086,0166" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x18f8 diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig index 17c2803..fad8e2f 100644 --- a/src/mainboard/kontron/ktqm77/Kconfig +++ b/src/mainboard/kontron/ktqm77/Kconfig @@ -28,10 +28,6 @@ int default 8 -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x0000 # TODO diff --git a/src/mainboard/lenovo/l520/Kconfig b/src/mainboard/lenovo/l520/Kconfig index 20ed67c..788c296 100644 --- a/src/mainboard/lenovo/l520/Kconfig +++ b/src/mainboard/lenovo/l520/Kconfig @@ -34,14 +34,6 @@ string default "ThinkPad L520" -config VGA_BIOS_FILE - string - default "pci8086,0126.rom" - -config VGA_BIOS_ID - string - default "8086,0126" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21dd diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig index 2c579b0..3f0b155 100644 --- a/src/mainboard/lenovo/s230u/Kconfig +++ b/src/mainboard/lenovo/s230u/Kconfig @@ -52,14 +52,6 @@ int default 60 -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - -config VGA_BIOS_ID - string - default "8086,0166" - config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x17aa diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig index 40fd213..c68f6f7 100644 --- a/src/mainboard/lenovo/t420/Kconfig +++ b/src/mainboard/lenovo/t420/Kconfig @@ -57,14 +57,6 @@ int default 10 -config VGA_BIOS_FILE - string - default "pci8086,0126.rom" - -config VGA_BIOS_ID - string - default "8086,0126" - config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x17aa diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig index ae50975..22a6e70 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -53,14 +53,6 @@ int default 10 -config VGA_BIOS_FILE - string - default "pci8086,0126.rom" - -config VGA_BIOS_ID - string - default "8086,0126" - config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x17aa diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index a938dcc..2ecaf15 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -55,10 +55,6 @@ int default 10 -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x17aa diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index 824f299..6f6dd23 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -64,14 +64,6 @@ int default 10 -config VGA_BIOS_ID - string - default "8086,0126" - -config VGA_BIOS_FILE - string - default "pci8086,0126.rom" - config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x17aa diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 0bbf941..ba6c269 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -67,11 +67,6 @@ int default 10 -config VGA_BIOS_FILE - string - default "pci8086,0106.rom" if BOARD_LENOVO_T530 - default "pci8086,0166.rom" if BOARD_LENOVO_W530 - config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x17aa diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig index abd3dc3..a71ee44 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig +++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig @@ -54,14 +54,6 @@ int default 10 -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - -config VGA_BIOS_ID - string - default "8086,0166" - config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x17aa diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 54d3648..941fadd 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -54,16 +54,6 @@ int default 10 -config VGA_BIOS_FILE - string - default "pci8086,0116.rom" if BOARD_LENOVO_X220I - default "pci8086,0126.rom" - -config VGA_BIOS_ID - string - default "8086,0116" if BOARD_LENOVO_X220I - default "8086,0126" - config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x17aa diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 29c0e7b..bb760a8 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -55,14 +55,6 @@ int default 10 -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - -config VGA_BIOS_ID - string - default "8086,0166" - config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x17aa diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index 8742e5e..003e0ad 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -35,10 +35,6 @@ int default 8 -config VGA_BIOS_FILE - string - default "pci8086,0106.rom" - config MAINBOARD_POWER_ON_AFTER_POWER_FAIL bool default n diff --git a/src/mainboard/sapphire/pureplatinumh61/Kconfig b/src/mainboard/sapphire/pureplatinumh61/Kconfig index 42cda6e..52b9c2a 100644 --- a/src/mainboard/sapphire/pureplatinumh61/Kconfig +++ b/src/mainboard/sapphire/pureplatinumh61/Kconfig @@ -29,14 +29,6 @@ string default "Pure Platinum H61" -config VGA_BIOS_FILE - string - default "pci8086,0162.rom" - -config VGA_BIOS_ID - string - default "8086,0162" - config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x1007 -- To view, visit https://review.coreboot.org/27212 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5b70974b47d04267770c8e91b7663450f0e2dbbb Gerrit-Change-Number: 27212 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com>

1 0

Change in coreboot[master]: mb/gigabyte/ga-{h61m-s2pv, b75m-d3h, b75m-d3v}: Clean up mainboard code.
by build bot (Jenkins) (Code Review) 23 Jun '18

23 Jun '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/27211 ) Change subject: mb/gigabyte/ga-{h61m-s2pv,b75m-d3h,b75m-d3v}: Clean up mainboard code. ...................................................................... Patch Set 1: Verified-1 Build Unstable https://qa.coreboot.org/job/coreboot-gerrit/75233/ : UNSTABLE https://qa.coreboot.org/job/coreboot-checkpatch/29292/ : SUCCESS -- To view, visit https://review.coreboot.org/27211 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib7747cceb5ba56f791677204cdc4c54c129c70c3 Gerrit-Change-Number: 27211 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Damien Zammit <damien(a)zamaudio.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 23 Jun 2018 16:00:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: mb/asus/p8h61-m_pro: Add new mainboard
by build bot (Jenkins) (Code Review) 23 Jun '18

23 Jun '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/26419 ) Change subject: mb/asus/p8h61-m_pro: Add new mainboard ...................................................................... Patch Set 10: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/29291/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/75232/ : SUCCESS -- To view, visit https://review.coreboot.org/26419 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7e89ebe43a2e1ff0308f4876e98bbf2f5a0d85f2 Gerrit-Change-Number: 26419 Gerrit-PatchSet: 10 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 23 Jun 2018 15:58:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: mb/gigabyte/ga-{h61m-s2pv, b75m-d3h, b75m-d3v}: Clean up mainboard code.
by Angel Pons (Code Review) 23 Jun '18

23 Jun '18

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/27211 Change subject: mb/gigabyte/ga-{h61m-s2pv,b75m-d3h,b75m-d3v}: Clean up mainboard code. ...................................................................... mb/gigabyte/ga-{h61m-s2pv,b75m-d3h,b75m-d3v}: Clean up mainboard code. I ported ga-h61m-s2pv basing on the two Gigabyte b75m boards. Based on another mainboard's code review comments, this patch improves the code quality of these three similar boards. ga-h61m-s2pv is tested and confirmed to be working, but I cannot say the same regarding the other two mainboards as I do not have them. Change-Id: Ib7747cceb5ba56f791677204cdc4c54c129c70c3 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig D src/mainboard/gigabyte/ga-b75m-d3h/acpi/video.asl M src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c M src/mainboard/gigabyte/ga-b75m-d3h/cmos.default M src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout M src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb M src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl M src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c M src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c M src/mainboard/gigabyte/ga-b75m-d3h/romstage.c M src/mainboard/gigabyte/ga-b75m-d3v/Kconfig D src/mainboard/gigabyte/ga-b75m-d3v/acpi/video.asl M src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c M src/mainboard/gigabyte/ga-b75m-d3v/cmos.default M src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout M src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb M src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl M src/mainboard/gigabyte/ga-b75m-d3v/hda_verb.c M src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c M src/mainboard/gigabyte/ga-b75m-d3v/romstage.c M src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig M src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb M src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl M src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c 24 files changed, 52 insertions(+), 259 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/27211/1 diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig index 580a9ad..8c0f36b 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig +++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig @@ -13,7 +13,6 @@ select HAVE_OPTION_TABLE select HAVE_CMOS_DEFAULT select HAVE_ACPI_RESUME - select HAVE_SMI_HANDLER select INTEL_INT15 select SERIRQ_CONTINUOUS_MODE select MAINBOARD_HAS_LIBGFXINIT @@ -23,10 +22,6 @@ int default 25 -config USBDEBUG_HCD_INDEX - int - default 2 - config MAINBOARD_DIR string default gigabyte/ga-b75m-d3h @@ -47,14 +42,6 @@ string default "pci8086,0162.rom" -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config IFD_BIOS_SECTION string default "0x00600000:0x007fffff" diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/video.asl b/src/mainboard/gigabyte/ga-b75m-d3h/acpi/video.asl deleted file mode 100644 index f87af3c..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/video.asl +++ /dev/null @@ -1 +0,0 @@ -// Blank diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c index 2d7b43f..5c09059 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c @@ -35,8 +35,5 @@ gnvs->s5u0 = 0; gnvs->s5u1 = 0; - // the lid is open by default. - gnvs->lids = 1; - acpi_update_thermal_table(gnvs); } diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default index a313f68..6f3cec7 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default +++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default @@ -1,7 +1,6 @@ boot_option=Fallback -debug_level=Spew +debug_level=Debug power_on_after_fail=Enable nmi=Enable -volume=0x3 sata_mode=AHCI -hyper_threading=Enable +gfx_uma_size=32M diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout index 7c72c4b..80950cd 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout +++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout @@ -52,18 +52,15 @@ 395 4 e 6 debug_level #399 1 r 0 unused -400 8 h 0 volume - # 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 +#422 2 r 0 unused # coreboot config options: cpu -424 1 e 2 hyper_threading #425 7 r 0 unused # coreboot config options: northbridge @@ -85,8 +82,6 @@ #ID value text 1 0 Disable 1 1 Enable -2 0 Enable -2 1 Disable 4 0 Fallback 4 1 Normal 6 0 Emergency @@ -114,4 +109,4 @@ # ----------------------------------------------------------------- checksums -checksum 392 415 984 +checksum 392 439 984 diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb index 3659354..b0c58f9 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb +++ b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb @@ -1,7 +1,7 @@ chip northbridge/intel/sandybridge # IGD Displays register "gfx.ndid" = "3" - register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 }" + register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" device cpu_cluster 0 on chip cpu/intel/socket_LGA1155 diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl b/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl index c7052d8..665d81b 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl +++ b/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl @@ -25,16 +25,15 @@ // Some generic macros #include "acpi/platform.asl" #include <cpu/intel/model_206ax/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> Scope (\_SB) { Device (PCI0) { - #include <northbridge/intel/sandybridge/acpi/sandybridge.asl> - #include <southbridge/intel/bd82x6x/acpi/pch.asl> - + #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-d3h/hda_verb.c b/src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c index 71d40cb..23cd570 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/hda_verb.c @@ -14,8 +14,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { + /* FIXME: Add configuration for sound */ }; -const u32 pc_beep_verbs[0] = {}; +const u32 pc_beep_verbs[] = {}; AZALIA_ARRAY_SIZES; diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c index 90131ff..4e8d9f5 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c @@ -15,22 +15,9 @@ * GNU General Public License for more details. */ -#include <types.h> -#include <string.h> #include <device/device.h> -#include <device/pci_def.h> -#include <device/pci_ops.h> -#include <console/console.h> #include <drivers/intel/gma/int15.h> -#include <pc80/mc146818rtc.h> -#include <arch/acpi.h> -#include <arch/io.h> -#include <arch/interrupt.h> -#include <boot/coreboot_tables.h> #include <southbridge/intel/bd82x6x/pch.h> -#include <smbios.h> -#include <device/pci.h> -#include <cbfs.h> static void mainboard_init(struct device *dev) { @@ -75,7 +62,9 @@ { 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); + 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 = { diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c b/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c index 5a2c935..6c4fa1e 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c @@ -13,30 +13,21 @@ * GNU General Public License for more details. */ +#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 SUPERIO_GPIO PNP_DEV(SUPERIO_BASE, IT8728F_GPIO) #define SERIAL_DEV PNP_DEV(SUPERIO_BASE, 0x01) -#include <arch/io.h> -#include <device/pci_def.h> -#include <device/pnp_def.h> -#include <cpu/x86/lapic.h> -#include <arch/acpi.h> -#include <console/console.h> -#include <superio/ite/it8728f/it8728f.h> -#include <superio/ite/common/ite.h> -#include <northbridge/intel/sandybridge/sandybridge.h> -#include <northbridge/intel/sandybridge/raminit_native.h> -#include <southbridge/intel/bd82x6x/pch.h> -#include <southbridge/intel/common/gpio.h> -#include <arch/cpu.h> -#include <cpu/x86/msr.h> - static void it8728f_b75md3h_disable_reboot(pnp_devfn_t dev) { /* GPIO SIO settings */ - ite_reg_write(dev, 0xEF, 0x7E); // magic + ite_reg_write(dev, 0xEF, 0x7E); // magic SIO disable reboot ite_reg_write(dev, 0x25, 0x40); // gpio pin function -> gp16 ite_reg_write(dev, 0x27, 0x10); // gpio pin function -> gp34 @@ -48,7 +39,7 @@ ite_reg_write(dev, 0xe9, 0x27); // bus select disable ite_reg_write(dev, 0xf0, 0x10); // ? ite_reg_write(dev, 0xf1, 0x42); // ? - ite_reg_write(dev, 0xf6, 0x1c); // hardware monitor alert beep -> gp36(pin12) + ite_reg_write(dev, 0xf6, 0x1c); // hwmon alert beep -> gp36(pin12) /* EC SIO settings */ ite_reg_write(IT8728F_EC, 0xf1, 0xc0); @@ -63,88 +54,13 @@ void mainboard_rcba_config(void) { -/* - pci_write_config32(PCI_DEV(0, 0x1f, 0), PMBASE, DEFAULT_PMBASE | 1); - pci_write_config32(PCI_DEV(0, 0x1f, 0), PMBASE + 4, 0); - pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x44, 0x80); - - outw (inw (DEFAULT_PMBASE | 0x003c) | 2, DEFAULT_PMBASE | 0x003c); - - RCBA32(0x3500) = 0x2000035f; - RCBA32(0x3504) = 0x2000035f; - RCBA32(0x3508) = 0x2000035f; - RCBA32(0x350c) = 0x2000035f; - RCBA32(0x3510) = 0x2000035f; - RCBA32(0x3514) = 0x2000035f; - RCBA32(0x3518) = 0x2000035f; - RCBA32(0x351c) = 0x2000035f; - RCBA32(0x3520) = 0x2000035f; - RCBA32(0x3524) = 0x2000035f; - RCBA32(0x3528) = 0x2000035f; - RCBA32(0x352c) = 0x2000035f; - RCBA32(0x3530) = 0x2000035f; - RCBA32(0x3534) = 0x2000035f; - RCBA32(0x3560) = 0x024c8001; - RCBA32(0x3564) = 0x000024a3; - RCBA32(0x3568) = 0x00040002; - RCBA32(0x356c) = 0x01000050; - RCBA32(0x3570) = 0x02000662; - RCBA32(0x3574) = 0x18000f9f; - RCBA32(0x3578) = 0x1800ff4f; - RCBA32(0x357c) = 0x0001d530; - RCBA32(0x35a0) = 0xc0300c03; - RCBA32(0x35a4) = 0x00241803; - - pci_write_config32 (PCI_DEV (0, 0x14, 0), 0xe4, 0x00000000); - - outw (0x0000, DEFAULT_PMBASE | 0x003c); - - 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(0x3418) = 0x1fee1fe1; - 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; -*/ /* Enable HECI */ RCBA32(FD2) &= ~0x2; } void pch_enable_lpc(void) { - /* - * Enable: - * EC Decode Range PortA30/A20 - * SuperIO Port2E/2F - * PS/2 Keyboard/Mouse Port60/64 - * FDD Port3F0h-3F5h and Port3F7h - */ - pci_write_config16(PCH_LPC_DEV, LPC_EN, KBC_LPC_EN | MC_LPC_EN | + 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); @@ -181,28 +97,6 @@ read_spd (&spd[3], 0x53, id_only); } -#if 0 -static void dmi_config(void) -{ - DMIBAR32(0x0218) = 0x06aa0b0c; - DMIBAR32(0x021c) = 0x0b0d0b0d; - DMIBAR32(0x0300) = 0x0011028d; - DMIBAR32(0x0304) = 0x002102cd; - DMIBAR32(0x030c) = 0x007d004b; - DMIBAR32(0x0310) = 0x007e004c; - DMIBAR32(0x0318) = 0x002304ad; - DMIBAR32(0x031c) = 0x003304ed; - DMIBAR32(0x03b8) = 0x005c05a4; - DMIBAR32(0x03bc) = 0x006c05e4; - DMIBAR32(0x0530) = 0x41d3b000; - DMIBAR32(0x0534) = 0x00019f80; - DMIBAR32(0x0ba4) = 0x0000000d; - DMIBAR32(0x0d80) = 0x1c9cfc0b; - DMIBAR32(0x0e1c) = 0x20000000; - DMIBAR32(0x0e2c) = 0x20000000; -} -#endif - void mainboard_early_init(int s3resume) { } diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig index b8694f5..2c0bb18 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig +++ b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig @@ -22,10 +22,6 @@ int default 25 -config USBDEBUG_HCD_INDEX - int - default 2 - config MAINBOARD_DIR string default gigabyte/ga-b75m-d3v @@ -46,14 +42,6 @@ string default "pci8086,0102.rom" -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config IFD_BIOS_SECTION string default "0x00600000:0x007fffff" diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/video.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/video.asl deleted file mode 100644 index f87af3c..0000000 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/video.asl +++ /dev/null @@ -1 +0,0 @@ -// Blank diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c index 2d7b43f..5c09059 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c +++ b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c @@ -35,8 +35,5 @@ gnvs->s5u0 = 0; gnvs->s5u1 = 0; - // the lid is open by default. - gnvs->lids = 1; - 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 index a313f68..6f3cec7 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default +++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default @@ -1,7 +1,6 @@ boot_option=Fallback -debug_level=Spew +debug_level=Debug power_on_after_fail=Enable nmi=Enable -volume=0x3 sata_mode=AHCI -hyper_threading=Enable +gfx_uma_size=32M diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout index 7c72c4b..80950cd 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout +++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout @@ -52,18 +52,15 @@ 395 4 e 6 debug_level #399 1 r 0 unused -400 8 h 0 volume - # 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 +#422 2 r 0 unused # coreboot config options: cpu -424 1 e 2 hyper_threading #425 7 r 0 unused # coreboot config options: northbridge @@ -85,8 +82,6 @@ #ID value text 1 0 Disable 1 1 Enable -2 0 Enable -2 1 Disable 4 0 Fallback 4 1 Normal 6 0 Emergency @@ -114,4 +109,4 @@ # ----------------------------------------------------------------- checksums -checksum 392 415 984 +checksum 392 439 984 diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb index 618943c..d7153f4 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb +++ b/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/sandybridge register "gfx.ndid" = "3" - register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 }" + register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" device cpu_cluster 0 on chip cpu/intel/socket_LGA1155 diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl b/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl index c7052d8..665d81b 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl +++ b/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl @@ -25,16 +25,15 @@ // Some generic macros #include "acpi/platform.asl" #include <cpu/intel/model_206ax/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> Scope (\_SB) { Device (PCI0) { - #include <northbridge/intel/sandybridge/acpi/sandybridge.asl> - #include <southbridge/intel/bd82x6x/acpi/pch.asl> - + #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/hda_verb.c b/src/mainboard/gigabyte/ga-b75m-d3v/hda_verb.c index 887eb51..3ae6b5d 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/hda_verb.c +++ b/src/mainboard/gigabyte/ga-b75m-d3v/hda_verb.c @@ -36,6 +36,6 @@ AZALIA_PIN_CFG(0, 0x1f, 0x411111f0) }; -const u32 pc_beep_verbs[] = { -}; +const u32 pc_beep_verbs[] = {}; + AZALIA_ARRAY_SIZES; diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c index 90131ff..4e8d9f5 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c +++ b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c @@ -15,22 +15,9 @@ * GNU General Public License for more details. */ -#include <types.h> -#include <string.h> #include <device/device.h> -#include <device/pci_def.h> -#include <device/pci_ops.h> -#include <console/console.h> #include <drivers/intel/gma/int15.h> -#include <pc80/mc146818rtc.h> -#include <arch/acpi.h> -#include <arch/io.h> -#include <arch/interrupt.h> -#include <boot/coreboot_tables.h> #include <southbridge/intel/bd82x6x/pch.h> -#include <smbios.h> -#include <device/pci.h> -#include <cbfs.h> static void mainboard_init(struct device *dev) { @@ -75,7 +62,9 @@ { 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); + 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 = { diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c b/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c index a389e68..64c323b 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c +++ b/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c @@ -13,30 +13,21 @@ * GNU General Public License for more details. */ +#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 SUPERIO_GPIO PNP_DEV(SUPERIO_BASE, IT8728F_GPIO) #define SERIAL_DEV PNP_DEV(SUPERIO_BASE, 0x01) -#include <arch/io.h> -#include <device/pci_def.h> -#include <device/pnp_def.h> -#include <cpu/x86/lapic.h> -#include <arch/acpi.h> -#include <console/console.h> -#include <superio/ite/it8728f/it8728f.h> -#include <superio/ite/common/ite.h> -#include <northbridge/intel/sandybridge/sandybridge.h> -#include <northbridge/intel/sandybridge/raminit_native.h> -#include <southbridge/intel/bd82x6x/pch.h> -#include <southbridge/intel/common/gpio.h> -#include <arch/cpu.h> -#include <cpu/x86/msr.h> - static void it8728f_b75md3v_disable_reboot(pnp_devfn_t dev) { /* GPIO SIO settings */ - ite_reg_write(dev, 0xEF, 0x7E); // magic + ite_reg_write(dev, 0xEF, 0x7E); // magic SIO disable reboot ite_reg_write(dev, 0x25, 0x40); // gpio pin function -> gp16 ite_reg_write(dev, 0x27, 0x10); // gpio pin function -> gp34 @@ -48,7 +39,7 @@ ite_reg_write(dev, 0xe9, 0x27); // bus select disable ite_reg_write(dev, 0xf0, 0x10); // ? ite_reg_write(dev, 0xf1, 0x42); // ? - ite_reg_write(dev, 0xf6, 0x1c); // hardware monitor alert beep -> gp36(pin12) + ite_reg_write(dev, 0xf6, 0x1c); // hwmon alert beep -> gp36(pin12) /* EC SIO settings */ ite_reg_write(IT8728F_EC, 0xf1, 0xc0); @@ -69,14 +60,7 @@ void pch_enable_lpc(void) { - /* - * Enable: - * EC Decode Range PortA30/A20 - * SuperIO Port2E/2F - * PS/2 Keyboard/Mouse Port60/64 - * FDD Port3F0h-3F5h and Port3F7h - */ - pci_write_config16(PCH_LPC_DEV, LPC_EN, KBC_LPC_EN | MC_LPC_EN | + 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); @@ -106,6 +90,7 @@ { 1, 5, 6 }, }; +/* 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); diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig b/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig index f53bc06..6e395b3 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig @@ -32,14 +32,6 @@ select HAVE_OPTION_TABLE select HAVE_CMOS_DEFAULT -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default "gigabyte/ga-h61m-s2pv" @@ -68,8 +60,4 @@ int default 8 -config USBDEBUG_HCD_INDEX # FIXME: check this - int - default 2 - endif # BOARD_GIGABYTE_GA_H61M_S2PV diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb index 9102b82..7ff7fbe 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb @@ -14,14 +14,8 @@ ## chip northbridge/intel/sandybridge - register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" - register "gfx.link_frequency_270_mhz" = "0" register "gfx.ndid" = "3" - register "gfx.use_spread_spectrum_clock" = "0" - register "gpu_dp_b_hotplug" = "4" - register "gpu_dp_c_hotplug" = "4" - register "gpu_dp_d_hotplug" = "4" - register "gpu_panel_port_select" = "0" + register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" device cpu_cluster 0x0 on chip cpu/intel/socket_LGA1155 device lapic 0x0 on diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl b/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl index d5719cc..71d238d 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl @@ -38,9 +38,9 @@ Scope (\_SB) { Device (PCI0) { - #include <northbridge/intel/sandybridge/acpi/sandybridge.asl> - #include <drivers/intel/gma/acpi/default_brightness_levels.asl> - #include <southbridge/intel/bd82x6x/acpi/pch.asl> + #include <northbridge/intel/sandybridge/acpi/sandybridge.asl> + #include <drivers/intel/gma/acpi/default_brightness_levels.asl> + #include <southbridge/intel/bd82x6x/acpi/pch.asl> } } } diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c b/src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c index 3e63721..f1cd176 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c @@ -57,11 +57,11 @@ void mainboard_config_superio(void) { - /* Enable serial port and flip some magic bits */ - + /* Enable serial port */ ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - ite_reg_write(SUPERIO_GPIO, 0xEF, 0x7E); // magic + /* Disable SIO WDT which kicks in DualBIOS */ + ite_reg_write(SUPERIO_GPIO, 0xEF, 0x7E); } void mainboard_get_spd(spd_raw_data *spd, bool id_only) -- To view, visit https://review.coreboot.org/27211 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7747cceb5ba56f791677204cdc4c54c129c70c3 Gerrit-Change-Number: 27211 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit June 2018