Riku Viitanen has uploaded this change for review.
mb/hp/snb_ivb_desktops: Make baseboard more generic
In preparation to merging all the other HP sandy/ivy desktops in here
as variants.
Move hda_verb.c, early_init.c, gma-mainboard.ads and data.vbt into
variant directories.
Kconfig:
Move options not common to the others under the variants instead.
devicetree:
Move XHCI to variant overridetrees (8200 gen has no USB 3)
board_info.txt:
Make it more generic. It seems to be copied from 8200 SFF and
inaccurate to Z220 anyway.
TEST: BUILD_TIMELESS=1 & Don't include .config in ROM image. CMT and
SFF ROMs are (SHA1) same as before.
Change-Id: Iaa8ea23bb9dd2eb1d6f1aab0fdefd4d0d7c4131f
Signed-off-by: Riku Viitanen <riku.viitanen@protonmail.com>
---
M src/mainboard/hp/snb_ivb_desktops/Kconfig
M src/mainboard/hp/snb_ivb_desktops/Makefile.mk
M src/mainboard/hp/snb_ivb_desktops/board_info.txt
M src/mainboard/hp/snb_ivb_desktops/devicetree.cb
R src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/data.vbt
R src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/early_init.c
R src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/gma-mainboard.ads
R src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/hda_verb.c
M src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb
C src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/data.vbt
C src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/early_init.c
C src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/gma-mainboard.ads
C src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/hda_verb.c
M src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/overridetree.cb
14 files changed, 22 insertions(+), 14 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/80494/1
diff --git a/src/mainboard/hp/snb_ivb_desktops/Kconfig b/src/mainboard/hp/snb_ivb_desktops/Kconfig
index 4cbb5e2..141e1a5 100644
--- a/src/mainboard/hp/snb_ivb_desktops/Kconfig
+++ b/src/mainboard/hp/snb_ivb_desktops/Kconfig
@@ -1,7 +1,5 @@
config BOARD_HP_SNB_IVB_DESKTOPS_COMMON
def_bool n
- select BOARD_ROMSIZE_KB_16384
- select GFX_GMA_ANALOG_I2C_HDMI_B
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select HAVE_CMOS_DEFAULT
@@ -14,15 +12,20 @@
select MEMORY_MAPPED_TPM
select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE
- select SOUTHBRIDGE_INTEL_BD82X6X
select SUPERIO_NUVOTON_NPCD378
select USE_NATIVE_RAMINIT
config BOARD_HP_Z220_CMT_WORKSTATION
select BOARD_HP_SNB_IVB_DESKTOPS_COMMON
+ select BOARD_ROMSIZE_KB_16384
+ select GFX_GMA_ANALOG_I2C_HDMI_B
+ select SOUTHBRIDGE_INTEL_BD82X6X
config BOARD_HP_Z220_SFF_WORKSTATION
select BOARD_HP_SNB_IVB_DESKTOPS_COMMON
+ select BOARD_ROMSIZE_KB_16384
+ select GFX_GMA_ANALOG_I2C_HDMI_B
+ select SOUTHBRIDGE_INTEL_BD82X6X
if BOARD_HP_SNB_IVB_DESKTOPS_COMMON
@@ -52,7 +55,7 @@
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
config INTEL_GMA_VBT_FILE
- default "src/mainboard/\$(MAINBOARDDIR)/data.vbt"
+ default "src/mainboard/\$(MAINBOARDDIR)/variants/\$(CONFIG_VARIANT_DIR)/data.vbt"
config DRAM_RESET_GATE_GPIO
int
diff --git a/src/mainboard/hp/snb_ivb_desktops/Makefile.mk b/src/mainboard/hp/snb_ivb_desktops/Makefile.mk
index 69ef088..4b44049 100644
--- a/src/mainboard/hp/snb_ivb_desktops/Makefile.mk
+++ b/src/mainboard/hp/snb_ivb_desktops/Makefile.mk
@@ -2,6 +2,7 @@
bootblock-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/gpio.c
-ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-bootblock-y += early_init.c
-romstage-y += early_init.c
+ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads
+bootblock-y += variants/$(VARIANT_DIR)/early_init.c
+romstage-y += variants/$(VARIANT_DIR)/early_init.c
+ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c
diff --git a/src/mainboard/hp/snb_ivb_desktops/board_info.txt b/src/mainboard/hp/snb_ivb_desktops/board_info.txt
index 4d6f6f9..813c1c9 100644
--- a/src/mainboard/hp/snb_ivb_desktops/board_info.txt
+++ b/src/mainboard/hp/snb_ivb_desktops/board_info.txt
@@ -1,7 +1,5 @@
Category: desktop
-Board URL: https://support.hp.com/de-de/product/HP-Compaq-8200-Elite-Small-Form-Factor-PC/5037931
-ROM IC: MX25L6405
-ROM package: SOIC-8
+ROM package: SOIC-8 or SOIC-16
ROM socketed: no
Flashrom support: yes
-Release year: 2013
+Release year: 2011-2012
diff --git a/src/mainboard/hp/snb_ivb_desktops/devicetree.cb b/src/mainboard/hp/snb_ivb_desktops/devicetree.cb
index d1aa576..39f9d9c 100644
--- a/src/mainboard/hp/snb_ivb_desktops/devicetree.cb
+++ b/src/mainboard/hp/snb_ivb_desktops/devicetree.cb
@@ -9,8 +9,6 @@
register "spd_addresses" = "{0x53, 0x52, 0x51, 0x50}"
device domain 0 on
- subsystemid 0x103c 0x1791 inherit
-
device ref host_bridge on end
device ref peg10 on end
device ref igd on end
diff --git a/src/mainboard/hp/snb_ivb_desktops/data.vbt b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/data.vbt
similarity index 100%
rename from src/mainboard/hp/snb_ivb_desktops/data.vbt
rename to src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/data.vbt
Binary files differ
diff --git a/src/mainboard/hp/snb_ivb_desktops/early_init.c b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/early_init.c
similarity index 100%
rename from src/mainboard/hp/snb_ivb_desktops/early_init.c
rename to src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/early_init.c
diff --git a/src/mainboard/hp/snb_ivb_desktops/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/gma-mainboard.ads
similarity index 100%
rename from src/mainboard/hp/snb_ivb_desktops/gma-mainboard.ads
rename to src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/gma-mainboard.ads
diff --git a/src/mainboard/hp/snb_ivb_desktops/hda_verb.c b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/hda_verb.c
similarity index 100%
rename from src/mainboard/hp/snb_ivb_desktops/hda_verb.c
rename to src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/hda_verb.c
diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb
index b82ff8a..1867d3a 100644
--- a/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb
@@ -6,7 +6,11 @@
device ref peg60 on end
chip southbridge/intel/bd82x6x
register "sata_port_map" = "0x3f"
+ register "superspeed_capable_ports" = "0x0000000f"
+ register "xhci_switchable_ports" = "0x0000000f"
+ register "xhci_overcurrent_mapping" = "0x0000000f"
+ device ref xhci on end
device ref pcie_rp2 on end
device ref pcie_rp3 on end
device ref pcie_rp4 on end
diff --git a/src/mainboard/hp/snb_ivb_desktops/data.vbt b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/data.vbt
similarity index 100%
copy from src/mainboard/hp/snb_ivb_desktops/data.vbt
copy to src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/data.vbt
Binary files differ
diff --git a/src/mainboard/hp/snb_ivb_desktops/early_init.c b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/early_init.c
similarity index 100%
copy from src/mainboard/hp/snb_ivb_desktops/early_init.c
copy to src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/early_init.c
diff --git a/src/mainboard/hp/snb_ivb_desktops/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/gma-mainboard.ads
similarity index 100%
copy from src/mainboard/hp/snb_ivb_desktops/gma-mainboard.ads
copy to src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/gma-mainboard.ads
diff --git a/src/mainboard/hp/snb_ivb_desktops/hda_verb.c b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/hda_verb.c
similarity index 100%
copy from src/mainboard/hp/snb_ivb_desktops/hda_verb.c
copy to src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/hda_verb.c
diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/overridetree.cb b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/overridetree.cb
index 8b827f8..560b407 100644
--- a/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/overridetree.cb
@@ -6,7 +6,11 @@
chip southbridge/intel/bd82x6x
register "sata_port_map" = "0xf"
- device ref pcie_rp5 on end # dummy setting
+ register "superspeed_capable_ports" = "0x0000000f"
+ register "xhci_switchable_ports" = "0x0000000f"
+ register "xhci_overcurrent_mapping" = "0x0000000f"
+
+ device ref xhci on end
end
end
end
To view, visit change 80494. To unsubscribe, or for help writing mail filters, visit settings.