lenovo/g505s: Switch from f15rl to f15tn

Support code for Trinity and Richland is identical now.

I have also come across a unit with Trinity model CPU,
whose CPUID was not listed in f15rl while f15tn already
had support for f15rl.

Change-Id: Ia869429b75a9b308b4d4a84f16914ca629b1b1b5
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/20773
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Kyösti Mälkki 2017-07-25 15:16:26 +03:00
parent 4e2294b429
commit 3754cda835
3 changed files with 11 additions and 11 deletions

View File

@ -19,8 +19,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select AGESA_LEGACY_WRAPPER select AGESA_LEGACY_WRAPPER
select CPU_AMD_AGESA_FAMILY15_RL select CPU_AMD_AGESA_FAMILY15_TN
select NORTHBRIDGE_AMD_AGESA_FAMILY15_RL select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
select SOUTHBRIDGE_AMD_AGESA_HUDSON select SOUTHBRIDGE_AMD_AGESA_HUDSON
select EC_COMPAL_ENE932 select EC_COMPAL_ENE932
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE

View File

@ -12,19 +12,19 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
chip northbridge/amd/agesa/family15rl/root_complex chip northbridge/amd/agesa/family15tn/root_complex
device cpu_cluster 0 on device cpu_cluster 0 on
chip cpu/amd/agesa/family15rl chip cpu/amd/agesa/family15tn
device lapic 10 on end device lapic 10 on end
end end
end end
device domain 0 on device domain 0 on
subsystemid 0x1022 0x1410 inherit subsystemid 0x1022 0x1410 inherit
chip northbridge/amd/agesa/family15rl # CPU side of HT root complex chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
chip northbridge/amd/agesa/family15rl # PCI 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 0.0 on end # Root Complex
device pci 0.2 on end # IOMMU device pci 0.2 on end # IOMMU
device pci 1.0 on end # Internal Graphics P2P bridge 0x99XX device pci 1.0 on end # Internal Graphics P2P bridge 0x99XX
@ -37,7 +37,7 @@ chip northbridge/amd/agesa/family15rl/root_complex
device pci 7.0 off end # device pci 7.0 off end #
device pci 8.0 off end # NB/SB Link P2P bridge ? device pci 8.0 off end # NB/SB Link P2P bridge ?
device pci 9.0 off end # device pci 9.0 off end #
end #chip northbridge/amd/agesa/family15rl # PCI side of HT root complex 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 chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus
device pci 10.0 off end # FCH USB XHCI Controller HC0 (N.B. breaks EHCI debug!!!) device pci 10.0 off end # FCH USB XHCI Controller HC0 (N.B. breaks EHCI debug!!!)
@ -84,6 +84,6 @@ chip northbridge/amd/agesa/family15rl/root_complex
{ {0x00, 0x00}, {0x00, 0x00}, }, // socket 1 - 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/family15rl # CPU side of HT root complex end #chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
end #domain end #domain
end #chip northbridge/amd/agesa/family15rl/root_complex end #chip northbridge/amd/agesa/family15tn/root_complex

View File

@ -38,7 +38,7 @@ DefinitionBlock (
#include <southbridge/amd/agesa/hudson/acpi/pcie.asl> #include <southbridge/amd/agesa/hudson/acpi/pcie.asl>
/* Describe the processor tree (\_PR) */ /* Describe the processor tree (\_PR) */
#include <cpu/amd/agesa/family15rl/acpi/cpu.asl> #include <cpu/amd/agesa/family15tn/acpi/cpu.asl>
/* Describe the supported Sleep States for this Southbridge */ /* Describe the supported Sleep States for this Southbridge */
#include <southbridge/amd/common/acpi/sleepstates.asl> #include <southbridge/amd/common/acpi/sleepstates.asl>
@ -55,7 +55,7 @@ DefinitionBlock (
Device(PCI0) { Device(PCI0) {
/* Describe the AMD Northbridge */ /* Describe the AMD Northbridge */
#include <northbridge/amd/agesa/family15rl/acpi/northbridge.asl> #include <northbridge/amd/agesa/family15tn/acpi/northbridge.asl>
/* Describe the AMD Fusion Controller Hub Southbridge */ /* Describe the AMD Fusion Controller Hub Southbridge */
#include <southbridge/amd/agesa/hudson/acpi/fch.asl> #include <southbridge/amd/agesa/hudson/acpi/fch.asl>