meta-asrock: Deduplicate common platform configuration
All existing ASRock platforms use most of the same core packages
(entity-manager, dbus-sensors, x86-power-control, phosphor-ipmi-kcs...),
so we might as well define it all in one place instead of duplicating it
for each machine.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Change-Id: Ife82b12cf909de6bdd770943adb30327a22438e1
diff --git a/meta-asrock/conf/machine/include/asrock.inc b/meta-asrock/conf/machine/include/asrock.inc
new file mode 100644
index 0000000..0c49702
--- /dev/null
+++ b/meta-asrock/conf/machine/include/asrock.inc
@@ -0,0 +1,18 @@
+MACHINE_FEATURES += "\
+ obmc-host-ipmi \
+ "
+
+VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager"
+PREFERRED_PROVIDER_virtual/obmc-inventory-data = "entity-manager"
+
+VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors"
+
+VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control"
+VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control"
+
+PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-asrock-apps"
+PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-asrock-apps"
+PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps"
+PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps"
+
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
diff --git a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf
index ab8b740..30ba6e6 100644
--- a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf
+++ b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf
@@ -8,14 +8,6 @@
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
-
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps"
-
-VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control"
-VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control"
-
-VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager"
-VIRTUAL-RUNTIME_obmc-sensors-hwmon = "dbus-sensors"
+require conf/machine/include/asrock.inc
MACHINEOVERRIDES =. "asrock-mmc-sdhci-reset-quirk:"
diff --git a/meta-asrock/meta-e3c256d4i/conf/machine/e3c256d4i.conf b/meta-asrock/meta-e3c256d4i/conf/machine/e3c256d4i.conf
index 1196537..d8d55ab 100644
--- a/meta-asrock/meta-e3c256d4i/conf/machine/e3c256d4i.conf
+++ b/meta-asrock/meta-e3c256d4i/conf/machine/e3c256d4i.conf
@@ -8,16 +8,6 @@
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
-
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps"
-
-VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control"
-VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control"
-
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
-
-VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager"
-VIRTUAL-RUNTIME_obmc-sensors-hwmon = "dbus-sensors"
+require conf/machine/include/asrock.inc
MACHINEOVERRIDES =. "asrock-mmc-sdhci-reset-quirk:"
diff --git a/meta-asrock/meta-romed8hm3/conf/machine/romed8hm3.conf b/meta-asrock/meta-romed8hm3/conf/machine/romed8hm3.conf
index 8ff4d77..ea5e2b5 100644
--- a/meta-asrock/meta-romed8hm3/conf/machine/romed8hm3.conf
+++ b/meta-asrock/meta-romed8hm3/conf/machine/romed8hm3.conf
@@ -8,14 +8,4 @@
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
-
-PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-asrock-apps"
-PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-asrock-apps"
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps"
-
-VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager"
-VIRTUAL-RUNTIME_obmc-sensors-hwmon = "dbus-sensors"
-
-VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control"
-VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control"
+require conf/machine/include/asrock.inc
diff --git a/meta-asrock/meta-spc621d8hm3/conf/machine/spc621d8hm3.conf b/meta-asrock/meta-spc621d8hm3/conf/machine/spc621d8hm3.conf
index b377947..ea5e2b5 100644
--- a/meta-asrock/meta-spc621d8hm3/conf/machine/spc621d8hm3.conf
+++ b/meta-asrock/meta-spc621d8hm3/conf/machine/spc621d8hm3.conf
@@ -8,16 +8,4 @@
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
-
-PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-asrock-apps"
-PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-asrock-apps"
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps"
-
-VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control"
-VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control"
-
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
-
-VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager"
-VIRTUAL-RUNTIME_obmc-sensors-hwmon = "dbus-sensors"
+require conf/machine/include/asrock.inc
diff --git a/meta-asrock/meta-x570d4u/conf/machine/x570d4u.conf b/meta-asrock/meta-x570d4u/conf/machine/x570d4u.conf
index 8ff4d77..ea5e2b5 100644
--- a/meta-asrock/meta-x570d4u/conf/machine/x570d4u.conf
+++ b/meta-asrock/meta-x570d4u/conf/machine/x570d4u.conf
@@ -8,14 +8,4 @@
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
-
-PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-asrock-apps"
-PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-asrock-apps"
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps"
-
-VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager"
-VIRTUAL-RUNTIME_obmc-sensors-hwmon = "dbus-sensors"
-
-VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control"
-VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control"
+require conf/machine/include/asrock.inc