Damien Zammit has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/62808 )
Change subject: hp/z220_series: Convert z220_sff_workstation into variant ......................................................................
hp/z220_series: Convert z220_sff_workstation into variant
No functional change, just refactoring to make room for CMT variant.
$ diff static.c ~/static.c.orig $
Change-Id: I6aaac75216b2d7c8bb48801454ce616ace3b1422 Signed-off-by: Damien Zammit damien@zamaudio.com --- R src/mainboard/hp/z220_series/Kconfig R src/mainboard/hp/z220_series/Kconfig.name A src/mainboard/hp/z220_series/Makefile.inc R src/mainboard/hp/z220_series/acpi/ec.asl R src/mainboard/hp/z220_series/acpi/platform.asl R src/mainboard/hp/z220_series/acpi/superio.asl R src/mainboard/hp/z220_series/board_info.txt R src/mainboard/hp/z220_series/cmos.default R src/mainboard/hp/z220_series/cmos.layout R src/mainboard/hp/z220_series/data.vbt R src/mainboard/hp/z220_series/devicetree.cb R src/mainboard/hp/z220_series/dsdt.asl R src/mainboard/hp/z220_series/early_init.c R src/mainboard/hp/z220_series/gma-mainboard.ads R src/mainboard/hp/z220_series/hda_verb.c R src/mainboard/hp/z220_series/mainboard.c R src/mainboard/hp/z220_series/variants/z220_sff_workstation/gpio.c A src/mainboard/hp/z220_series/variants/z220_sff_workstation/overridetree.cb D src/mainboard/hp/z220_sff_workstation/Makefile.inc 19 files changed, 33 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/62808/1
diff --git a/src/mainboard/hp/z220_sff_workstation/Kconfig b/src/mainboard/hp/z220_series/Kconfig similarity index 69% rename from src/mainboard/hp/z220_sff_workstation/Kconfig rename to src/mainboard/hp/z220_series/Kconfig index d706665..bb1093b 100644 --- a/src/mainboard/hp/z220_sff_workstation/Kconfig +++ b/src/mainboard/hp/z220_series/Kconfig @@ -1,7 +1,6 @@ -if BOARD_HP_Z220_SFF_WORKSTATION +config BOARD_HP_Z220_SERIES + def_bool n
-config BOARD_SPECIFIC_OPTIONS - def_bool y select BOARD_ROMSIZE_KB_16384 select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES @@ -20,6 +19,8 @@ select GFX_GMA_ANALOG_I2C_HDMI_B select MAINBOARD_USES_IFD_GBE_REGION
+if BOARD_HP_Z220_SERIES + config VBOOT select VBOOT_VBNV_CMOS select VBOOT_NO_BOARD_SUPPORT @@ -36,10 +37,19 @@ default 0x570000
config MAINBOARD_DIR - default "hp/z220_sff_workstation" + default "hp/z220_series" + +config VARIANT_DIR + default "z220_sff_workstation" if BOARD_HP_Z220_SFF_WORKSTATION
config MAINBOARD_PART_NUMBER - default "HP Z220 SFF Workstation" + default "HP Z220 SFF Workstation" if BOARD_HP_Z220_SFF_WORKSTATION + +config OVERRIDE_DEVICETREE + default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + +config INTEL_GMA_VBT_FILE + default "src/mainboard/$(MAINBOARDDIR)/data.vbt"
config DRAM_RESET_GATE_GPIO int diff --git a/src/mainboard/hp/z220_sff_workstation/Kconfig.name b/src/mainboard/hp/z220_series/Kconfig.name similarity index 69% rename from src/mainboard/hp/z220_sff_workstation/Kconfig.name rename to src/mainboard/hp/z220_series/Kconfig.name index 037ebc0..77b36ad 100644 --- a/src/mainboard/hp/z220_sff_workstation/Kconfig.name +++ b/src/mainboard/hp/z220_series/Kconfig.name @@ -1,2 +1,3 @@ config BOARD_HP_Z220_SFF_WORKSTATION bool "Z220 SFF Workstation" + select BOARD_HP_Z220_SERIES diff --git a/src/mainboard/hp/z220_series/Makefile.inc b/src/mainboard/hp/z220_series/Makefile.inc new file mode 100644 index 0000000..00426a8 --- /dev/null +++ b/src/mainboard/hp/z220_series/Makefile.inc @@ -0,0 +1,5 @@ +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 diff --git a/src/mainboard/hp/z220_sff_workstation/acpi/ec.asl b/src/mainboard/hp/z220_series/acpi/ec.asl similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/acpi/ec.asl rename to src/mainboard/hp/z220_series/acpi/ec.asl diff --git a/src/mainboard/hp/z220_sff_workstation/acpi/platform.asl b/src/mainboard/hp/z220_series/acpi/platform.asl similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/acpi/platform.asl rename to src/mainboard/hp/z220_series/acpi/platform.asl diff --git a/src/mainboard/hp/z220_sff_workstation/acpi/superio.asl b/src/mainboard/hp/z220_series/acpi/superio.asl similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/acpi/superio.asl rename to src/mainboard/hp/z220_series/acpi/superio.asl diff --git a/src/mainboard/hp/z220_sff_workstation/board_info.txt b/src/mainboard/hp/z220_series/board_info.txt similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/board_info.txt rename to src/mainboard/hp/z220_series/board_info.txt diff --git a/src/mainboard/hp/z220_sff_workstation/cmos.default b/src/mainboard/hp/z220_series/cmos.default similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/cmos.default rename to src/mainboard/hp/z220_series/cmos.default diff --git a/src/mainboard/hp/z220_sff_workstation/cmos.layout b/src/mainboard/hp/z220_series/cmos.layout similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/cmos.layout rename to src/mainboard/hp/z220_series/cmos.layout diff --git a/src/mainboard/hp/z220_sff_workstation/data.vbt b/src/mainboard/hp/z220_series/data.vbt similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/data.vbt rename to src/mainboard/hp/z220_series/data.vbt Binary files differ diff --git a/src/mainboard/hp/z220_sff_workstation/devicetree.cb b/src/mainboard/hp/z220_series/devicetree.cb similarity index 98% rename from src/mainboard/hp/z220_sff_workstation/devicetree.cb rename to src/mainboard/hp/z220_series/devicetree.cb index 0de9cfa..4611bec 100644 --- a/src/mainboard/hp/z220_sff_workstation/devicetree.cb +++ b/src/mainboard/hp/z220_series/devicetree.cb @@ -30,7 +30,6 @@ register "pcie_hotplug_map" = "{ 0, 0, 0, 0, 0, 0, 0, 0 }" register "pcie_port_coalesce" = "true" register "sata_interface_speed_support" = "0x3" - register "sata_port_map" = "0xf" register "spi_lvscc" = "0x2005" register "spi_uvscc" = "0x2005"
diff --git a/src/mainboard/hp/z220_sff_workstation/dsdt.asl b/src/mainboard/hp/z220_series/dsdt.asl similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/dsdt.asl rename to src/mainboard/hp/z220_series/dsdt.asl diff --git a/src/mainboard/hp/z220_sff_workstation/early_init.c b/src/mainboard/hp/z220_series/early_init.c similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/early_init.c rename to src/mainboard/hp/z220_series/early_init.c diff --git a/src/mainboard/hp/z220_sff_workstation/gma-mainboard.ads b/src/mainboard/hp/z220_series/gma-mainboard.ads similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/gma-mainboard.ads rename to src/mainboard/hp/z220_series/gma-mainboard.ads diff --git a/src/mainboard/hp/z220_sff_workstation/hda_verb.c b/src/mainboard/hp/z220_series/hda_verb.c similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/hda_verb.c rename to src/mainboard/hp/z220_series/hda_verb.c diff --git a/src/mainboard/hp/z220_sff_workstation/mainboard.c b/src/mainboard/hp/z220_series/mainboard.c similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/mainboard.c rename to src/mainboard/hp/z220_series/mainboard.c diff --git a/src/mainboard/hp/z220_sff_workstation/gpio.c b/src/mainboard/hp/z220_series/variants/z220_sff_workstation/gpio.c similarity index 100% rename from src/mainboard/hp/z220_sff_workstation/gpio.c rename to src/mainboard/hp/z220_series/variants/z220_sff_workstation/gpio.c diff --git a/src/mainboard/hp/z220_series/variants/z220_sff_workstation/overridetree.cb b/src/mainboard/hp/z220_series/variants/z220_sff_workstation/overridetree.cb new file mode 100644 index 0000000..c31bf33 --- /dev/null +++ b/src/mainboard/hp/z220_series/variants/z220_sff_workstation/overridetree.cb @@ -0,0 +1,12 @@ +## SPDX-License-Identifier: GPL-2.0-only + +chip northbridge/intel/sandybridge + device domain 0 on + subsystemid 0x103c 0x1791 inherit + + chip southbridge/intel/bd82x6x + register "sata_port_map" = "0xf" + device pci 1c.4 on end # dummy setting + end + end +end diff --git a/src/mainboard/hp/z220_sff_workstation/Makefile.inc b/src/mainboard/hp/z220_sff_workstation/Makefile.inc deleted file mode 100644 index f0b34f9..0000000 --- a/src/mainboard/hp/z220_sff_workstation/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -bootblock-y += gpio.c -romstage-y += gpio.c -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads -bootblock-y += early_init.c -romstage-y += early_init.c
-
Damien Zammit (Code Review)