diff options
-rw-r--r-- | meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 4 | ||||
-rw-r--r-- | meta-ampere/meta-jade/conf/machine/mtjade.conf | 4 | ||||
-rw-r--r-- | meta-aspeed/conf/machine/evb-ast2500.conf | 5 | ||||
-rw-r--r-- | meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf | 3 | ||||
-rw-r--r-- | meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf | 4 | ||||
-rw-r--r-- | meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf | 3 | ||||
-rw-r--r-- | meta-ibm/conf/machine/mihawk.conf | 3 | ||||
-rw-r--r-- | meta-ibm/conf/machine/witherspoon.conf | 3 | ||||
-rw-r--r-- | meta-ibm/meta-romulus/conf/machine/romulus.conf | 4 | ||||
-rw-r--r-- | meta-ingrasys/meta-zaius/conf/machine/zaius.conf | 3 | ||||
-rw-r--r-- | meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf | 3 | ||||
-rw-r--r-- | meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf | 5 | ||||
-rw-r--r-- | meta-quanta/meta-f0b/conf/machine/f0b.conf | 3 | ||||
-rw-r--r-- | meta-supermicro/meta-x11spi/conf/machine/x11spi.conf | 3 | ||||
-rw-r--r-- | meta-tyan/meta-s7106/conf/machine/s7106.conf | 3 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/conf/machine/nicole.conf | 3 |
16 files changed, 56 insertions, 0 deletions
diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index 91ca5bb1b7..67fc64c8fe 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -2,6 +2,10 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-amd-${MACHINE}.dtb" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" + UBOOT_MACHINE:ethanolx = "ast_g5_phy_config" require conf/machine/include/ast2500.inc diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 40bd0f81e0..5854dff24a 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -1,5 +1,9 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-ampere-${MACHINE}.dtb" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_phy_config" require conf/machine/include/ast2500.inc diff --git a/meta-aspeed/conf/machine/evb-ast2500.conf b/meta-aspeed/conf/machine/evb-ast2500.conf index 1ee80f8bea..ebb8b0be04 100644 --- a/meta-aspeed/conf/machine/evb-ast2500.conf +++ b/meta-aspeed/conf/machine/evb-ast2500.conf @@ -1,4 +1,9 @@ KERNEL_DEVICETREE = "aspeed-ast2500-evb.dtb" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" + UBOOT_MACHINE = "ast_g5_phy_config" require conf/machine/include/ast2500.inc diff --git a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf index ab79b520f8..d562b2f012 100644 --- a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf +++ b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf @@ -1,6 +1,9 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-asrock-${MACHINE}.dtb" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_phy_config" FLASH_SIZE = "32768" diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf index fce4b93f2d..0c78afcacf 100644 --- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf +++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf @@ -1,6 +1,10 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" + UBOOT_MACHINE = "ast_g5_ncsi_config" require conf/machine/include/facebook-compute-singlehost.inc diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf index f57383b8c0..2573a4e34d 100644 --- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf +++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf @@ -1,6 +1,9 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_ncsi_config" require conf/machine/include/facebook-compute-multihost.inc diff --git a/meta-ibm/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf index 932ed5e7b3..c4373ad0f6 100644 --- a/meta-ibm/conf/machine/mihawk.conf +++ b/meta-ibm/conf/machine/mihawk.conf @@ -1,6 +1,9 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_ncsi_config" OBMC_POWER_SUPPLY_INSTANCES = "0 1" diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf index e71992219a..9a74f91dfb 100644 --- a/meta-ibm/conf/machine/witherspoon.conf +++ b/meta-ibm/conf/machine/witherspoon.conf @@ -1,6 +1,9 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_ncsi_config" OBMC_POWER_SUPPLY_INSTANCES = "0 1" diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf index 1d73ba4fe1..958521052c 100644 --- a/meta-ibm/meta-romulus/conf/machine/romulus.conf +++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf @@ -1,5 +1,9 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_ncsi_config" require conf/machine/include/ast2500.inc diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf index 7a558bcc15..7bb0cf05b0 100644 --- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf +++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf @@ -1,6 +1,9 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_ncsi_config" FLASH_SIZE = "65536" diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf index 1c217913e9..8fff0ad1e3 100644 --- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf +++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf @@ -10,6 +10,9 @@ PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_phy_config" FLASH_SIZE = "32768" diff --git a/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf b/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf index d0ca8a3c34..a24cf7596d 100644 --- a/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf +++ b/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf @@ -5,6 +5,11 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/intel.inc + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" + UBOOT_MACHINE = "ast_g5_phy_config" FLASH_SIZE = "32768" diff --git a/meta-quanta/meta-f0b/conf/machine/f0b.conf b/meta-quanta/meta-f0b/conf/machine/f0b.conf index 7ffc266c8d..0981e0d171 100644 --- a/meta-quanta/meta-f0b/conf/machine/f0b.conf +++ b/meta-quanta/meta-f0b/conf/machine/f0b.conf @@ -3,6 +3,9 @@ KMACHINE = "aspeed" # The device tree of F0B is not ready yet, temporarily replace it with aspeed-ast2500-evb.dtb KERNEL_DEVICETREE = "${KMACHINE}-ast2500-evb.dtb" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_phy_config" MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" diff --git a/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf b/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf index 55b07b0575..3cc2bec3f7 100644 --- a/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf +++ b/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf @@ -5,6 +5,9 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/supermicro.inc +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_phy_config" FLASH_SIZE = "32768" diff --git a/meta-tyan/meta-s7106/conf/machine/s7106.conf b/meta-tyan/meta-s7106/conf/machine/s7106.conf index 0244ebd764..d78a501139 100644 --- a/meta-tyan/meta-s7106/conf/machine/s7106.conf +++ b/meta-tyan/meta-s7106/conf/machine/s7106.conf @@ -1,6 +1,9 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-tyan-${MACHINE}.dtb" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_phy_config" require conf/machine/include/ast2500.inc diff --git a/meta-yadro/meta-nicole/conf/machine/nicole.conf b/meta-yadro/meta-nicole/conf/machine/nicole.conf index 495e3bd242..fc4c48790a 100644 --- a/meta-yadro/meta-nicole/conf/machine/nicole.conf +++ b/meta-yadro/meta-nicole/conf/machine/nicole.conf @@ -1,6 +1,9 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" UBOOT_MACHINE = "ast_g5_ncsi_config" require conf/machine/include/ast2500.inc |