AGESA fam16kb boards: Clean up devicetree
Remove double nesting of chip northbridge/amd. There is requirement to keep SPD address map in the same chip block with device 0:18.2. Change-Id: Id3a161c54341d0c5c569ea6118ee6f890b7f62e6 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/30735 Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
872b42486a
commit
760970fb38
|
@ -21,9 +21,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
||||||
device domain 0 on
|
device domain 0 on
|
||||||
subsystemid 0x1022 0x1410 inherit
|
subsystemid 0x1022 0x1410 inherit
|
||||||
chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
chip northbridge/amd/agesa/family16kb
|
||||||
|
|
||||||
chip northbridge/amd/agesa/family16kb # PCI side of HT root complex
|
|
||||||
device pci 0.0 on end # Root Complex
|
device pci 0.0 on end # Root Complex
|
||||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
||||||
device pci 1.1 on end # Internal Multimedia
|
device pci 1.1 on end # Internal Multimedia
|
||||||
|
@ -55,6 +53,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
device pci 14.7 on end # SD
|
device pci 14.7 on end # SD
|
||||||
end #chip southbridge/amd/agesa/hudson
|
end #chip southbridge/amd/agesa/hudson
|
||||||
|
|
||||||
|
chip northbridge/amd/agesa/family16kb
|
||||||
device pci 18.0 on end
|
device pci 18.0 on end
|
||||||
device pci 18.1 on end
|
device pci 18.1 on end
|
||||||
device pci 18.2 on end
|
device pci 18.2 on end
|
||||||
|
@ -66,7 +65,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
{ {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
|
{ {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
|
||||||
{ {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
|
||||||
|
|
||||||
end #chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
|
||||||
end #domain
|
end #domain
|
||||||
end #northbridge/amd/agesa/family16kb/root_complex
|
end #northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
|
@ -21,9 +21,8 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
||||||
device domain 0 on
|
device domain 0 on
|
||||||
subsystemid 0x1022 0x1410 inherit
|
subsystemid 0x1022 0x1410 inherit
|
||||||
chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
|
||||||
|
|
||||||
chip northbridge/amd/agesa/family16kb # PCI side of HT root complex
|
chip northbridge/amd/agesa/family16kb
|
||||||
device pci 0.0 on end # Root Complex
|
device pci 0.0 on end # Root Complex
|
||||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
||||||
device pci 1.1 on end # Internal Multimedia
|
device pci 1.1 on end # Internal Multimedia
|
||||||
|
@ -96,6 +95,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
device pci 14.7 on end # SD
|
device pci 14.7 on end # SD
|
||||||
end #chip southbridge/amd/agesa/hudson
|
end #chip southbridge/amd/agesa/hudson
|
||||||
|
|
||||||
|
chip northbridge/amd/agesa/family16kb
|
||||||
device pci 18.0 on end
|
device pci 18.0 on end
|
||||||
device pci 18.1 on end
|
device pci 18.1 on end
|
||||||
device pci 18.2 on end
|
device pci 18.2 on end
|
||||||
|
@ -107,7 +107,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
{ {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
|
{ {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
|
||||||
{ {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
|
||||||
|
|
||||||
end #chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
|
||||||
end #domain
|
end #domain
|
||||||
end #northbridge/amd/agesa/family16kb/root_complex
|
end #northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
|
@ -23,8 +23,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
||||||
device domain 0 on
|
device domain 0 on
|
||||||
subsystemid 0x1043 0x8623 inherit
|
subsystemid 0x1043 0x8623 inherit
|
||||||
chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
chip northbridge/amd/agesa/family16kb
|
||||||
chip northbridge/amd/agesa/family16kb # PCI side of HT root complex
|
|
||||||
device pci 0.0 on end # Root Complex
|
device pci 0.0 on end # Root Complex
|
||||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
||||||
device pci 1.1 on end # Internal Multimedia
|
device pci 1.1 on end # Internal Multimedia
|
||||||
|
@ -94,6 +93,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
device pci 14.7 off end # SD - no card reader present
|
device pci 14.7 off end # SD - no card reader present
|
||||||
end #chip southbridge/amd/agesa/hudson
|
end #chip southbridge/amd/agesa/hudson
|
||||||
|
|
||||||
|
chip northbridge/amd/agesa/family16kb
|
||||||
device pci 18.0 on end
|
device pci 18.0 on end
|
||||||
device pci 18.1 on end
|
device pci 18.1 on end
|
||||||
device pci 18.2 on end
|
device pci 18.2 on end
|
||||||
|
@ -104,7 +104,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
{
|
{
|
||||||
{ {0xA0, 0xA2} },
|
{ {0xA0, 0xA2} },
|
||||||
}"
|
}"
|
||||||
|
end
|
||||||
|
|
||||||
end #chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
|
||||||
end #domain
|
end #domain
|
||||||
end #northbridge/amd/agesa/family16kb/root_complex
|
end #northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
|
@ -21,9 +21,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
||||||
device domain 0 on
|
device domain 0 on
|
||||||
subsystemid 0x1022 0x1410 inherit
|
subsystemid 0x1022 0x1410 inherit
|
||||||
chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
chip northbridge/amd/agesa/family16kb
|
||||||
|
|
||||||
chip northbridge/amd/agesa/family16kb # PCI side of HT root complex
|
|
||||||
device pci 0.0 on end # Root Complex
|
device pci 0.0 on end # Root Complex
|
||||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9835
|
device pci 1.0 on end # Internal Graphics P2P bridge 0x9835
|
||||||
device pci 1.1 on end # Internal Multimedia
|
device pci 1.1 on end # Internal Multimedia
|
||||||
|
@ -104,13 +102,14 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
device pci 14.7 on end # SD
|
device pci 14.7 on end # SD
|
||||||
end #chip southbridge/amd/agesa/hudson
|
end #chip southbridge/amd/agesa/hudson
|
||||||
|
|
||||||
|
chip northbridge/amd/agesa/family16kb
|
||||||
device pci 18.0 on end
|
device pci 18.0 on end
|
||||||
device pci 18.1 on end
|
device pci 18.1 on end
|
||||||
device pci 18.2 on end
|
device pci 18.2 on end
|
||||||
device pci 18.3 on end
|
device pci 18.3 on end
|
||||||
device pci 18.4 on end
|
device pci 18.4 on end
|
||||||
device pci 18.5 on end
|
device pci 18.5 on end
|
||||||
|
end
|
||||||
|
|
||||||
end #chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
|
||||||
end #domain
|
end #domain
|
||||||
end #northbridge/amd/agesa/family16kb/root_complex
|
end #northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
|
@ -23,9 +23,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
||||||
device domain 0 on
|
device domain 0 on
|
||||||
subsystemid 0x1022 0x1410 inherit
|
subsystemid 0x1022 0x1410 inherit
|
||||||
chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
chip northbridge/amd/agesa/family16kb
|
||||||
|
|
||||||
chip northbridge/amd/agesa/family16kb # PCI side of HT root complex
|
|
||||||
device pci 0.0 on end # Root Complex
|
device pci 0.0 on end # Root Complex
|
||||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
||||||
device pci 1.1 on end # Internal Multimedia
|
device pci 1.1 on end # Internal Multimedia
|
||||||
|
@ -91,6 +89,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
device pci 14.7 off end # SD
|
device pci 14.7 off end # SD
|
||||||
end #chip southbridge/amd/agesa/hudson
|
end #chip southbridge/amd/agesa/hudson
|
||||||
|
|
||||||
|
chip northbridge/amd/agesa/family16kb
|
||||||
device pci 18.0 on end
|
device pci 18.0 on end
|
||||||
device pci 18.1 on end
|
device pci 18.1 on end
|
||||||
device pci 18.2 on end
|
device pci 18.2 on end
|
||||||
|
@ -102,7 +101,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
{ {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
|
{ {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
|
||||||
{ {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
|
||||||
|
|
||||||
end #chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
|
||||||
end #domain
|
end #domain
|
||||||
end #northbridge/amd/agesa/family16kb/root_complex
|
end #northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
|
@ -22,9 +22,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
||||||
device domain 0 on
|
device domain 0 on
|
||||||
subsystemid 0x1002 0x439d inherit
|
subsystemid 0x1002 0x439d inherit
|
||||||
chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
chip northbridge/amd/agesa/family16kb
|
||||||
|
|
||||||
chip northbridge/amd/agesa/family16kb # PCI side of HT root complex
|
|
||||||
device pci 0.0 on end # Root Complex
|
device pci 0.0 on end # Root Complex
|
||||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
||||||
device pci 1.1 on end # Internal Multimedia
|
device pci 1.1 on end # Internal Multimedia
|
||||||
|
@ -99,6 +97,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
device pci 14.7 off end # SD
|
device pci 14.7 off end # SD
|
||||||
end #chip southbridge/amd/agesa/hudson
|
end #chip southbridge/amd/agesa/hudson
|
||||||
|
|
||||||
|
chip northbridge/amd/agesa/family16kb
|
||||||
device pci 18.0 on end
|
device pci 18.0 on end
|
||||||
device pci 18.1 on end
|
device pci 18.1 on end
|
||||||
device pci 18.2 on end
|
device pci 18.2 on end
|
||||||
|
@ -109,7 +108,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
{
|
{
|
||||||
{ {0xA0, 0xA2} },
|
{ {0xA0, 0xA2} },
|
||||||
}"
|
}"
|
||||||
|
end
|
||||||
|
|
||||||
end #chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
|
||||||
end #domain
|
end #domain
|
||||||
end #northbridge/amd/agesa/family16kb/root_complex
|
end #northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
|
@ -21,9 +21,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
||||||
device domain 0 on
|
device domain 0 on
|
||||||
subsystemid 0x1022 0x1410 inherit
|
subsystemid 0x1022 0x1410 inherit
|
||||||
chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
chip northbridge/amd/agesa/family16kb
|
||||||
|
|
||||||
chip northbridge/amd/agesa/family16kb # PCI side of HT root complex
|
|
||||||
device pci 0.0 on end # Root Complex
|
device pci 0.0 on end # Root Complex
|
||||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9835
|
device pci 1.0 on end # Internal Graphics P2P bridge 0x9835
|
||||||
device pci 1.1 on end # Internal Multimedia
|
device pci 1.1 on end # Internal Multimedia
|
||||||
|
@ -48,13 +46,14 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
device pci 14.7 on end # SD
|
device pci 14.7 on end # SD
|
||||||
end #chip southbridge/amd/agesa/hudson
|
end #chip southbridge/amd/agesa/hudson
|
||||||
|
|
||||||
|
chip northbridge/amd/agesa/family16kb
|
||||||
device pci 18.0 on end
|
device pci 18.0 on end
|
||||||
device pci 18.1 on end
|
device pci 18.1 on end
|
||||||
device pci 18.2 on end
|
device pci 18.2 on end
|
||||||
device pci 18.3 on end
|
device pci 18.3 on end
|
||||||
device pci 18.4 on end
|
device pci 18.4 on end
|
||||||
device pci 18.5 on end
|
device pci 18.5 on end
|
||||||
|
end
|
||||||
|
|
||||||
end #chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
|
||||||
end #domain
|
end #domain
|
||||||
end #northbridge/amd/agesa/family16kb/root_complex
|
end #northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
|
@ -22,9 +22,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
||||||
device domain 0 on
|
device domain 0 on
|
||||||
subsystemid 0x1022 0x1410 inherit
|
subsystemid 0x1022 0x1410 inherit
|
||||||
chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
chip northbridge/amd/agesa/family16kb
|
||||||
|
|
||||||
chip northbridge/amd/agesa/family16kb # PCI side of HT root complex
|
|
||||||
device pci 0.0 on end # Root Complex
|
device pci 0.0 on end # Root Complex
|
||||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
||||||
device pci 1.1 on end # Internal Multimedia
|
device pci 1.1 on end # Internal Multimedia
|
||||||
|
@ -76,6 +74,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
device pci 16.2 on end # USB
|
device pci 16.2 on end # USB
|
||||||
end #chip southbridge/amd/agesa/hudson
|
end #chip southbridge/amd/agesa/hudson
|
||||||
|
|
||||||
|
chip northbridge/amd/agesa/family16kb
|
||||||
device pci 18.0 on end
|
device pci 18.0 on end
|
||||||
device pci 18.1 on end
|
device pci 18.1 on end
|
||||||
device pci 18.2 on end
|
device pci 18.2 on end
|
||||||
|
@ -86,6 +85,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
|
||||||
{
|
{
|
||||||
{ {0xA0, 0x00}, {0x00, 0x00}, }, // socket 0 - Channel 0 - 8-bit SPD addresses
|
{ {0xA0, 0x00}, {0x00, 0x00}, }, // socket 0 - Channel 0 - 8-bit SPD addresses
|
||||||
}"
|
}"
|
||||||
end #chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
|
end
|
||||||
|
|
||||||
end #domain
|
end #domain
|
||||||
end #northbridge/amd/agesa/family16kb/root_complex
|
end #northbridge/amd/agesa/family16kb/root_complex
|
||||||
|
|
Loading…
Reference in New Issue