summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Zhang <jonzhang@fb.com>2021-03-02 09:01:59 -0800
committerAngel Pons <th3fanbus@gmail.com>2021-03-10 19:25:25 +0000
commit570ae23516593e243e29750f4b61a1b841a5ad27 (patch)
tree5de404fd42aa74e0bed8bcd0337000cfcb51a894
parent019c0049a27c7eea0b92e8e5af3e5fb992beb315 (diff)
downloadcoreboot-570ae23516593e243e29750f4b61a1b841a5ad27.tar.gz
coreboot-570ae23516593e243e29750f4b61a1b841a5ad27.tar.bz2
coreboot-570ae23516593e243e29750f4b61a1b841a5ad27.zip
mb/facebook/watson/v2: enable IPMI to be detected as PNP device
Watson v2 mainboard has hardware support and OpenBMC support for IPMI. Add drivers/ipmi to the device tree of watson v2 mainboard. Use original device tree for watson mainboard. TESTED=booted watson v2 board, and tested ipmitool command:    0 | OEM record fb | 2800000000f0ffffffffffffff Signed-off-by: Ravi Rama <rrama@arista.com> Signed-off-by: Jonathan Zhang <jonzhang@fb.com> Change-Id: I1be653278dbfd704d24756cf82be73bdae4bb13c Reviewed-on: https://review.coreboot.org/c/coreboot/+/51311 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Christian Walter <christian.walter@9elements.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/facebook/watson/Kconfig5
-rw-r--r--src/mainboard/facebook/watson/variants/watson/devicetree.cb (renamed from src/mainboard/facebook/watson/devicetree.cb)0
-rw-r--r--src/mainboard/facebook/watson/variants/watson_v2/devicetree.cb23
3 files changed, 28 insertions, 0 deletions
diff --git a/src/mainboard/facebook/watson/Kconfig b/src/mainboard/facebook/watson/Kconfig
index 919117d6537b..668b0ba66f7f 100644
--- a/src/mainboard/facebook/watson/Kconfig
+++ b/src/mainboard/facebook/watson/Kconfig
@@ -37,6 +37,10 @@ config MAINBOARD_PART_NUMBER
string
default "Watson"
+config DEVICETREE
+ string
+ default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
+
config IRQ_SLOT_COUNT
int
default 18
@@ -47,6 +51,7 @@ config CBFS_SIZE
config VARIANT_DIR
string
+ default "watson" if BOARD_FACEBOOK_WATSON
default "watson_v2" if BOARD_FACEBOOK_WATSON_V2
config VBOOT_FWID_MODEL
diff --git a/src/mainboard/facebook/watson/devicetree.cb b/src/mainboard/facebook/watson/variants/watson/devicetree.cb
index 92fe9c3000bf..92fe9c3000bf 100644
--- a/src/mainboard/facebook/watson/devicetree.cb
+++ b/src/mainboard/facebook/watson/variants/watson/devicetree.cb
diff --git a/src/mainboard/facebook/watson/variants/watson_v2/devicetree.cb b/src/mainboard/facebook/watson/variants/watson_v2/devicetree.cb
new file mode 100644
index 000000000000..276dea0c8b7e
--- /dev/null
+++ b/src/mainboard/facebook/watson/variants/watson_v2/devicetree.cb
@@ -0,0 +1,23 @@
+chip soc/intel/fsp_broadwell_de
+ device cpu_cluster 0 on
+ device lapic 0 on end
+ end
+ device domain 0 on
+ device pci 00.0 on end # SoC router
+ device pci 14.0 on end # xHCI Controller
+ device pci 19.0 on end # Gigabit LAN Controller
+ device pci 1d.0 on end # EHCI Controller
+ device pci 1f.0 on # LPC Bridge
+ chip drivers/pc80/tpm
+ device pnp 0c31.0 on end
+ end
+ chip drivers/ipmi
+ device pnp ca2.0 on end
+ register "bmc_i2c_address" = "0x20"
+ end
+ end
+ device pci 1f.2 on end # SATA Controller
+ device pci 1f.3 on end # SMBus Controller
+ device pci 1f.5 on end # SATA Controller
+ end
+end