summaryrefslogtreecommitdiff
path: root/meta-phosphor/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta-phosphor/conf/machine')
-rw-r--r--meta-phosphor/conf/machine/include/ibm-power-cpu.inc1
-rw-r--r--meta-phosphor/conf/machine/include/ibm-power10-cpu.inc2
-rw-r--r--meta-phosphor/conf/machine/include/ibm-power8-cpu.inc2
-rw-r--r--meta-phosphor/conf/machine/include/ibm-power9-cpu.inc2
-rw-r--r--meta-phosphor/conf/machine/include/obmc-bsp-common.inc15
5 files changed, 21 insertions, 1 deletions
diff --git a/meta-phosphor/conf/machine/include/ibm-power-cpu.inc b/meta-phosphor/conf/machine/include/ibm-power-cpu.inc
new file mode 100644
index 000000000..1ff6dd304
--- /dev/null
+++ b/meta-phosphor/conf/machine/include/ibm-power-cpu.inc
@@ -0,0 +1 @@
+MACHINEOVERRIDES =. "ibm-power-cpu:"
diff --git a/meta-phosphor/conf/machine/include/ibm-power10-cpu.inc b/meta-phosphor/conf/machine/include/ibm-power10-cpu.inc
new file mode 100644
index 000000000..7d518ddaa
--- /dev/null
+++ b/meta-phosphor/conf/machine/include/ibm-power10-cpu.inc
@@ -0,0 +1,2 @@
+MACHINEOVERRIDES =. "ibm-power10-cpu:"
+require conf/machine/include/ibm-power-cpu.inc
diff --git a/meta-phosphor/conf/machine/include/ibm-power8-cpu.inc b/meta-phosphor/conf/machine/include/ibm-power8-cpu.inc
new file mode 100644
index 000000000..8be9d5395
--- /dev/null
+++ b/meta-phosphor/conf/machine/include/ibm-power8-cpu.inc
@@ -0,0 +1,2 @@
+MACHINEOVERRIDES =. "ibm-power8-cpu:"
+require conf/machine/include/ibm-power-cpu.inc
diff --git a/meta-phosphor/conf/machine/include/ibm-power9-cpu.inc b/meta-phosphor/conf/machine/include/ibm-power9-cpu.inc
new file mode 100644
index 000000000..d92cbdf37
--- /dev/null
+++ b/meta-phosphor/conf/machine/include/ibm-power9-cpu.inc
@@ -0,0 +1,2 @@
+MACHINEOVERRIDES =. "ibm-power9-cpu:"
+require conf/machine/include/ibm-power-cpu.inc
diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
index 4bafeafce..8a3da1199 100644
--- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
+++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
@@ -5,10 +5,23 @@
KERNEL_CLASSES ?= "kernel-fitimage"
KERNEL_IMAGETYPES ?= "fitImage"
+# Static images. This is the default if no other layout is specified.
+IMAGE_FSTYPES += "${@bb.utils.contains_any('DISTRO_FEATURES', \
+ 'obmc-ubi-fs phosphor-mmc', \
+ '', \
+ 'mtd-static mtd-static-tar mtd-static-alltar', d)}"
+
+# UBI images.
IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \
'obmc-ubi-fs', \
'mtd-ubi mtd-ubi-tar', \
- 'mtd-static mtd-static-tar mtd-static-alltar', d)}"
+ '', d)}"
+
+# eMMC images.
+IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \
+ 'phosphor-mmc', \
+ 'wic.xz mmc-ext4-tar', \
+ '', d)}"
INITRAMFS_CTYPE ?= "xz"
INITRAMFS_FSTYPES = "cpio.${INITRAMFS_CTYPE}"