diff options
| author | Konstantin Aladyshev <aladyshev22@gmail.com> | 2023-02-08 12:22:52 +0300 |
|---|---|---|
| committer | Konstantin Aladyshev <aladyshev22@gmail.com> | 2023-02-08 12:22:52 +0300 |
| commit | 44ec983b844a309188c5aa017e3e1f8b4ab1f245 (patch) | |
| tree | 8bce4cd9ca1d61dee58b0b5d3b082fdef5e4378f /meta-amd | |
| parent | 16a8c7950565d75611026290ecd2f2f81d541a70 (diff) | |
| download | openbmc-44ec983b844a309188c5aa017e3e1f8b4ab1f245.tar.xz | |
meta-amd: Create common machine configuration file
Move common machine configurations to the include file.
Change-Id: Iafd07c4d6dc1abdcffede7568e6aef16e2f53ac4
Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
Diffstat (limited to 'meta-amd')
| -rw-r--r-- | meta-amd/conf/machine/include/amd.inc | 23 | ||||
| -rw-r--r-- | meta-amd/meta-daytonax/conf/machine/daytonax.conf | 24 | ||||
| -rw-r--r-- | meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 27 |
3 files changed, 25 insertions, 49 deletions
diff --git a/meta-amd/conf/machine/include/amd.inc b/meta-amd/conf/machine/include/amd.inc new file mode 100644 index 0000000000..78ca8f230a --- /dev/null +++ b/meta-amd/conf/machine/include/amd.inc @@ -0,0 +1,23 @@ +MACHINE_FEATURES += "\ + obmc-bmc-state-mgmt \ + obmc-chassis-state-mgmt \ + obmc-host-state-mgmt \ + obmc-phosphor-chassis-mgmt \ + obmc-host-ipmi \ + obmc-phosphor-fan-mgmt \ + obmc-phosphor-flash-mgmt \ + " + +VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" +VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" +VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" +VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors" + +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-amd-apps" +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" +PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps" + +OVERRIDES .= ":amd" diff --git a/meta-amd/meta-daytonax/conf/machine/daytonax.conf b/meta-amd/meta-daytonax/conf/machine/daytonax.conf index 7843aad44f..cd7af72b0d 100644 --- a/meta-amd/meta-daytonax/conf/machine/daytonax.conf +++ b/meta-amd/meta-daytonax/conf/machine/daytonax.conf @@ -6,32 +6,10 @@ UBOOT_MACHINE = "evb-ast2500_defconfig" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/amd.inc SERIAL_CONSOLES = "115200;ttyS4" FLASH_SIZE = "32768" -MACHINE_FEATURES += "\ - obmc-bmc-state-mgmt \ - obmc-chassis-state-mgmt \ - obmc-host-state-mgmt \ - obmc-phosphor-chassis-mgmt \ - obmc-host-ipmi \ - obmc-phosphor-fan-mgmt \ - obmc-phosphor-flash-mgmt \ - " - -VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" -VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" -VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" -VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors" - -PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-amd-apps" -PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" -PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps" -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" -PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "daytonax-led-manager-config-native" - -OVERRIDES .= ":amd" diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index dd6ef518ac..d84e648eae 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -1,4 +1,3 @@ - KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-amd-${MACHINE}.dtb" @@ -7,34 +6,10 @@ UBOOT_MACHINE = "evb-ast2500_defconfig" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/amd.inc SERIAL_CONSOLES = "115200;ttyS4" FLASH_SIZE = "32768" -MACHINE_FEATURES += "\ - obmc-bmc-state-mgmt \ - obmc-chassis-state-mgmt \ - obmc-host-state-mgmt \ - obmc-phosphor-chassis-mgmt \ - obmc-host-ipmi \ - obmc-phosphor-fan-mgmt \ - obmc-phosphor-flash-mgmt \ - " - -VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" -VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" -VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" -VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors" - -PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-amd-apps" -PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" -PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps" -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" -PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ethanolx-led-manager-config-native" - -OVERRIDES .= ":amd" - - |