summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-facebook/conf/machine/include/facebook-compute-multihost.inc3
-rw-r--r--meta-facebook/conf/machine/include/facebook-compute-singlehost.inc3
-rw-r--r--meta-facebook/conf/machine/include/facebook-compute.inc3
-rw-r--r--meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf2
-rw-r--r--meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf2
5 files changed, 11 insertions, 2 deletions
diff --git a/meta-facebook/conf/machine/include/facebook-compute-multihost.inc b/meta-facebook/conf/machine/include/facebook-compute-multihost.inc
new file mode 100644
index 000000000..f472cfa47
--- /dev/null
+++ b/meta-facebook/conf/machine/include/facebook-compute-multihost.inc
@@ -0,0 +1,3 @@
+require conf/machine/include/facebook-compute.inc
+
+OVERRIDES .= ":fb-compute-multihost"
diff --git a/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc
new file mode 100644
index 000000000..f6a868329
--- /dev/null
+++ b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc
@@ -0,0 +1,3 @@
+require conf/machine/include/facebook-compute.inc
+
+OVERRIDES .= ":fb-compute-singlehost"
diff --git a/meta-facebook/conf/machine/include/facebook-compute.inc b/meta-facebook/conf/machine/include/facebook-compute.inc
new file mode 100644
index 000000000..66b0f756b
--- /dev/null
+++ b/meta-facebook/conf/machine/include/facebook-compute.inc
@@ -0,0 +1,3 @@
+require conf/machine/include/facebook.inc
+
+OVERRIDES .= ":fb-compute"
diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
index 97da01fb0..1e6ee084b 100644
--- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
+++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
@@ -3,7 +3,7 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
UBOOT_MACHINE = "ast_g5_ncsi_config"
-require conf/machine/include/facebook.inc
+require conf/machine/include/facebook-compute-singlehost.inc
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
index 97da01fb0..f2a651204 100644
--- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
+++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
@@ -3,7 +3,7 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
UBOOT_MACHINE = "ast_g5_ncsi_config"
-require conf/machine/include/facebook.inc
+require conf/machine/include/facebook-compute-multihost.inc
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc