summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bblayers.conf.sample13
-rw-r--r--conf/layer.conf2
-rw-r--r--conf/local.conf.sample7
-rw-r--r--conf/machine/include/phyam335x.inc2
-rw-r--r--conf/machine/include/phyimx6.inc8
-rw-r--r--conf/machine/include/phyimx6ul.inc12
-rw-r--r--conf/machine/include/phyimx8.inc19
-rw-r--r--conf/machine/include/phyrk3288.inc19
-rw-r--r--conf/machine/phyboard-mira-imx6-10.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-11.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-12.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-13.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-14.conf4
-rw-r--r--conf/machine/phyboard-mira-imx6-15.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-3.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-4.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-5.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-6.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-7.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-8.conf4
-rw-r--r--conf/machine/phyboard-mira-imx6-9.conf2
-rw-r--r--conf/machine/phyboard-nunki-imx6-1.conf2
-rw-r--r--conf/machine/phyboard-polaris-imx8m-2.conf43
-rw-r--r--conf/machine/phyboard-polaris-imx8m-3.conf9
-rw-r--r--conf/machine/phyboard-polis-imx8mm-3.conf (renamed from conf/machine/phyboard-polis-imx8mm-2.conf)16
-rw-r--r--conf/machine/phyboard-polis-imx8mn-1.conf (renamed from conf/machine/phyboard-polis-imx8mm-1.conf)23
-rw-r--r--conf/machine/phyboard-segin-imx6ul-2.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-3.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-4.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-5.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-6.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-7.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-8.conf16
-rw-r--r--conf/machine/phycard-imx6-2.conf17
-rw-r--r--conf/machine/phycore-imx8-2.conf6
-rw-r--r--conf/machine/phycore-rk3288-4.conf14
-rw-r--r--conf/machine/phycore-stm32mp1-1.conf46
-rw-r--r--conf/machine/phycore-stm32mp1-2.conf115
-rw-r--r--conf/machine/phycore-stm32mp1-3.conf116
-rw-r--r--conf/machine/phycore-stm32mp1-4.conf116
-rw-r--r--conf/machine/phycore-stm32mp1-5.conf113
-rw-r--r--conf/machine/phycore-stm32mp1-6.conf139
-rw-r--r--conf/machine/phycore-stm32mp1-7.conf138
-rw-r--r--conf/machine/phyflex-imx6-1.conf2
-rw-r--r--conf/machine/phyflex-imx6-10.conf2
-rw-r--r--conf/machine/phyflex-imx6-11.conf2
-rw-r--r--conf/machine/phyflex-imx6-2.conf2
-rw-r--r--conf/machine/phyflex-imx6-3.conf2
-rw-r--r--conf/machine/phyflex-imx6-4.conf2
-rw-r--r--conf/machine/phyflex-imx6-5.conf2
-rw-r--r--conf/machine/phyflex-imx6-6.conf2
-rw-r--r--conf/machine/phyflex-imx6-7.conf2
-rw-r--r--conf/machine/phyflex-imx6-8.conf2
-rw-r--r--conf/machine/phyflex-imx6-9.conf2
54 files changed, 903 insertions, 172 deletions
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index d8f4418..045ed1a 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -6,12 +6,7 @@ BBPATH = "${TOPDIR}"
BBFILES ?= ""
OEROOT := "##OEROOT##"
-BBLAYERS ?= " \
- ${OEROOT}/meta \
- ${OEROOT}/meta-poky \
- ${OEROOT}/../meta-openembedded/meta-oe \
- ${OEROOT}/../meta-openembedded/meta-networking \
- ${OEROOT}/../meta-openembedded/meta-python \
- ${OEROOT}/../meta-openembedded/meta-multimedia \
- ${OEROOT}/../meta-openembedded/meta-filesystems \
- "
+
+# In our BSPs active layers are defined by the manifest.xml for all BSPs. The
+# bblayers.conf gets created by the init_bblayers.py script.
+BBLAYERS ?= ""
diff --git a/conf/layer.conf b/conf/layer.conf
index 9268cc5..15fa9c2 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -11,7 +11,7 @@ BBFILE_PATTERN_phytec = "^${LAYERDIR}/"
BBFILE_PRIORITY_phytec = "20"
LAYERVERSION_phytec = "2"
LAYERDEPENDS_phytec = "core"
-LAYERSERIES_COMPAT_phytec = "zeus"
+LAYERSERIES_COMPAT_phytec = "dunfell"
# Additional license directories.
LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 7c07caf..67314dd 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -60,8 +60,15 @@ BB_DISKMON_DIRS ??= "\
# This variable is ordering dependend.
#IMAGE_FSTYPES = "tar.gz wic ubifs emmc"
+# Select a preconfigured A/B system setup for SD/eMMC images.
+#WKS_FILES_mx6 = "imx6-rauc-sdimage.wks"
+#WKS_FILES_mx6ul = "imx6-rauc-sdimage.wks"
+#WKS_FILES_mx8m = "imx8m-rauc-sdimage.wks"
+
# Turn on debugging options of the kernel
DEBUG_BUILD_pn-linux-mainline = "1"
+# Turn on debugging options of the imx kernel
+DEBUG_BUILD_pn-linux-imx = "1"
# Turn on debugging options of the barebox
DEBUG_BUILD_pn-barebox = "1"
diff --git a/conf/machine/include/phyam335x.inc b/conf/machine/include/phyam335x.inc
index 32f0996..b2d407c 100644
--- a/conf/machine/include/phyam335x.inc
+++ b/conf/machine/include/phyam335x.inc
@@ -57,7 +57,7 @@ QT_QPA_DEFAULT_PLATFORM ?= "${@bb.utils.contains('MACHINE_FEATURES', 'sgx', 'egl
#WIC
IMAGE_CLASSES += "wic-helper"
IMAGE_CLASSES += "wic-am335x-helper"
-IMAGE_BOOT_FILES = "barebox.bin MLO zImage ${@parse_dtbs(d)}"
+IMAGE_BOOT_FILES = "barebox.bin MLO zImage oftree ${KERNEL_DEVICETREE}"
#copy ubifs image to sdcard
IMAGE_BOOT_FILES += "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ubifs;${IMAGE_LINK_NAME}.ubifs"
IMAGE_TYPEDEP_wic ??= "ubifs"
diff --git a/conf/machine/include/phyimx6.inc b/conf/machine/include/phyimx6.inc
index 5a1e500..302983e 100644
--- a/conf/machine/include/phyimx6.inc
+++ b/conf/machine/include/phyimx6.inc
@@ -7,7 +7,7 @@ SOC_FAMILY = "imx:mx6"
#Bootloader
PREFERRED_PROVIDER_virtual/bootloader ?= "barebox"
-# Kernel
+# Kernel
PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
KERNEL_IMAGETYPE ?= "zImage"
# Install modules in initramfs and roofs
@@ -27,6 +27,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
# Ship kernel modules
MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+MACHINE_EXTRA_RDEPENDS = "firmware-imx-sdma-imx6q"
SERIAL_CONSOLES = "115200;ttymxc0"
@@ -35,7 +36,10 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat"
#WIC
IMAGE_CLASSES += "wic-helper"
-IMAGE_BOOT_FILES = "zImage ${@parse_dtbs(d)}"
+IMAGE_BOOT_FILES = "zImage oftree ${KERNEL_DEVICETREE}"
+IMAGE_BOOT_FILES_secureboot = "fitImage.fitimg"
+BAREBOX_BINARY = "barebox.bin"
+BAREBOX_BINARY_secureboot = "barebox-s.bin"
WKS_FILES_mx6 ?= "imx6-sdimage.wks"
# default images to build
diff --git a/conf/machine/include/phyimx6ul.inc b/conf/machine/include/phyimx6ul.inc
index 838bac4..99d21b8 100644
--- a/conf/machine/include/phyimx6ul.inc
+++ b/conf/machine/include/phyimx6ul.inc
@@ -14,13 +14,18 @@ PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
#Bootloader
PREFERRED_PROVIDER_virtual/bootloader ?= "barebox"
+
# Kernel
PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
KERNEL_IMAGETYPE ?= "zImage"
+
# Install modules in initramfs and roofs
PACKAGE_INSTALL_append = " kernel-modules"
+
# Ship kernel modules
MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+MACHINE_EXTRA_RDEPENDS = "firmware-imx-sdma-imx6q"
+
# dont install kernelimage to rootfs
RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
@@ -40,7 +45,10 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048"
#WIC
IMAGE_CLASSES += "wic-helper"
-IMAGE_BOOT_FILES = "zImage ${@parse_dtbs(d)}"
+IMAGE_BOOT_FILES = "zImage oftree ${KERNEL_DEVICETREE}"
+IMAGE_BOOT_FILES_secureboot = "fitImage.fitimg"
+BAREBOX_BINARY = "barebox.bin"
+BAREBOX_BINARY_secureboot = "barebox-s.bin"
WKS_FILES_mx6ul ?= "imx6-sdimage.wks"
# default images to build
@@ -49,7 +57,7 @@ IMAGE_FSTYPES ?= "tar.gz wic ubifs"
# Avoid pulling package 'gstreamer1.0-plugins-bad-meta' into the image
# 'core-image-sato', because the recipe gstreamer1.0-plugins-bad depends on
# virtual/libgles2.
-RRECOMMENDS_gst-player-bin_remove_pn-gst-player = "gstreamer1.0-plugins-bad-meta"
+RRECOMMENDS_gst-examples-bin_remove_pn-gst-examples = "gstreamer1.0-plugins-bad-meta"
# XServer
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
diff --git a/conf/machine/include/phyimx8.inc b/conf/machine/include/phyimx8.inc
index b86d839..1cc581f 100644
--- a/conf/machine/include/phyimx8.inc
+++ b/conf/machine/include/phyimx8.inc
@@ -1,14 +1,19 @@
-# Common settings for phytecs imx8 boards
+# Common settings for PHYTEC's i.MX8 boards
PREFERRED_PROVIDER_virtual/bootloader= "u-boot-imx"
+PREFERRED_PROVIDER_imx-boot="imx-boot-phytec"
+PREFERRED_PROVIDER_u-boot-fw-utils = "libubootenv"
+PREFERRED_PROVIDER_opencl-headers_imx = "imx-gpu-viv"
-#WIC
+# Wic
IMAGE_CLASSES += "wic-helper"
IMAGE_CLASSES += "wic-imx8-helper"
IMAGE_BOOTFILES_DEPENDS ?= ""
-IMAGE_BOOT_FILES ?= "Image ${@parse_dtbs(d)}"
-WKS_FILES_mx8 ?= "imx8-sdimage.wks.in"
-WKS_FILES_mx8m ?= "imx8m-sdimage.wks.in"
+IMAGE_BOOT_FILES += "oftree"
+WKS_FILES_mx8 ?= "imx8-sdimage.wks"
+WKS_FILES_mx8m ?= "imx8m-sdimage.wks"
+WKS_FILES_mx8mn ?= "imx8mn-sdimage.wks"
+WKS_FILES_mx8mp ?= "imx8mn-sdimage.wks"
-# default images to build
-IMAGE_FSTYPES_mx8 = "tar.gz wic"
+# Default images to build
+IMAGE_FSTYPES = "tar.gz wic"
diff --git a/conf/machine/include/phyrk3288.inc b/conf/machine/include/phyrk3288.inc
index a53fae1..6c8c674 100644
--- a/conf/machine/include/phyrk3288.inc
+++ b/conf/machine/include/phyrk3288.inc
@@ -17,26 +17,9 @@ PACKAGE_INSTALL_append = " kernel-modules"
SERIAL_CONSOLES = "115200;ttyS2"
-PREFERRED_PROVIDER_virtual/egl ?= "mali-t760-libs"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mali-t760-libs"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mali-t760-libs"
-
-PREFERRED_VERSION_libdrm ?= "2.4.74"
-
-# Workaround: package.bbclass cannot extract dependency information from mali
-# library automatically. SONAME is missing and libEGL and libGLES are only
-# links to libmali. With this the package 'qtbase' rdepends on
-# 'mali-t760-libs' correctly.
-ASSUME_SHLIBS += "libEGL.so:mali-t760-libs"
-ASSUME_SHLIBS += "libGLESv1_CM.so:mali-t760-libs"
-ASSUME_SHLIBS += "libGLESv2.so:mali-t760-libs"
-ASSUME_SHLIBS += "libOpenCL.so:mali-t760-libs"
-ASSUME_SHLIBS += "libgbm.so:mali-t760-libs"
-ASSUME_SHLIBS += "libwayland-egl.so:mali-t760-libs"
-
#WIC
IMAGE_CLASSES += "wic-helper"
-IMAGE_BOOT_FILES = "zImage;linuximage boot.scr ${@parse_dtbs(d)}"
+IMAGE_BOOT_FILES = "zImage;linuximage boot.scr oftree ${KERNEL_DEVICETREE}"
WKS_FILES_rk3288 ?= "rk3288-sdimage.wks"
# default images to build
diff --git a/conf/machine/phyboard-mira-imx6-10.conf b/conf/machine/phyboard-mira-imx6-10.conf
index c089053..052f0fe 100644
--- a/conf/machine/phyboard-mira-imx6-10.conf
+++ b/conf/machine/phyboard-mira-imx6-10.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-11.conf b/conf/machine/phyboard-mira-imx6-11.conf
index 327fc6e..20096c6 100644
--- a/conf/machine/phyboard-mira-imx6-11.conf
+++ b/conf/machine/phyboard-mira-imx6-11.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-12.conf b/conf/machine/phyboard-mira-imx6-12.conf
index 4f3bd56..dfddea4 100644
--- a/conf/machine/phyboard-mira-imx6-12.conf
+++ b/conf/machine/phyboard-mira-imx6-12.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-nand-rs485.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-13.conf b/conf/machine/phyboard-mira-imx6-13.conf
index 0039514..dbfeda3 100644
--- a/conf/machine/phyboard-mira-imx6-13.conf
+++ b/conf/machine/phyboard-mira-imx6-13.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-14.conf b/conf/machine/phyboard-mira-imx6-14.conf
index 1c0b676..e629579 100644
--- a/conf/machine/phyboard-mira-imx6-14.conf
+++ b/conf/machine/phyboard-mira-imx6-14.conf
@@ -12,8 +12,8 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-mira-ff-rdk-emmc.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-emmc-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6dl-som-emmc-1gib"
-MACHINE_FEATURES += "resistivetouch pci can wifi"
+MACHINE_FEATURES += "resistivetouch pci can wifi emmc"
SERIAL_CONSOLES = "115200;ttymxc1"
diff --git a/conf/machine/phyboard-mira-imx6-15.conf b/conf/machine/phyboard-mira-imx6-15.conf
index a55365c..7cbce56 100644
--- a/conf/machine/phyboard-mira-imx6-15.conf
+++ b/conf/machine/phyboard-mira-imx6-15.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-nand-256mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6dl-som-nand-256mb"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-3.conf b/conf/machine/phyboard-mira-imx6-3.conf
index d64e897..4b5adb0 100644
--- a/conf/machine/phyboard-mira-imx6-3.conf
+++ b/conf/machine/phyboard-mira-imx6-3.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-4.conf b/conf/machine/phyboard-mira-imx6-4.conf
index d07adb8..2ac1a8d 100644
--- a/conf/machine/phyboard-mira-imx6-4.conf
+++ b/conf/machine/phyboard-mira-imx6-4.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-mira-lc-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-lc-nand-256mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6dl-som-lc-nand-256mb"
MACHINE_FEATURES += "wifi"
diff --git a/conf/machine/phyboard-mira-imx6-5.conf b/conf/machine/phyboard-mira-imx6-5.conf
index b92dfa4..6dfe6c3 100644
--- a/conf/machine/phyboard-mira-imx6-5.conf
+++ b/conf/machine/phyboard-mira-imx6-5.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-emmc.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-emmc-2gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-emmc-2gib"
MACHINE_FEATURES += "resistivetouch pci can wifi emmc"
diff --git a/conf/machine/phyboard-mira-imx6-6.conf b/conf/machine/phyboard-mira-imx6-6.conf
index 2905a02..671e472 100644
--- a/conf/machine/phyboard-mira-imx6-6.conf
+++ b/conf/machine/phyboard-mira-imx6-6.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-mira-lc-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6dl-som-nand-1gib"
MACHINE_FEATURES += "wifi"
diff --git a/conf/machine/phyboard-mira-imx6-7.conf b/conf/machine/phyboard-mira-imx6-7.conf
index 23ed4fa..eb7ef39 100644
--- a/conf/machine/phyboard-mira-imx6-7.conf
+++ b/conf/machine/phyboard-mira-imx6-7.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-mira-lc-rdk-emmc.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-lc-emmc-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6dl-som-lc-emmc-1gib"
MACHINE_FEATURES += "wifi emmc"
diff --git a/conf/machine/phyboard-mira-imx6-8.conf b/conf/machine/phyboard-mira-imx6-8.conf
index 4191dc0..ce1d526 100644
--- a/conf/machine/phyboard-mira-imx6-8.conf
+++ b/conf/machine/phyboard-mira-imx6-8.conf
@@ -12,8 +12,8 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-emmc.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-emmc-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-emmc-1gib"
-MACHINE_FEATURES += "resistivetouch pci can wifi"
+MACHINE_FEATURES += "resistivetouch pci can wifi emmc"
SERIAL_CONSOLES = "115200;ttymxc1"
diff --git a/conf/machine/phyboard-mira-imx6-9.conf b/conf/machine/phyboard-mira-imx6-9.conf
index 145d5f6..f638769 100644
--- a/conf/machine/phyboard-mira-imx6-9.conf
+++ b/conf/machine/phyboard-mira-imx6-9.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6qp-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6qp-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6qp-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-nunki-imx6-1.conf b/conf/machine/phyboard-nunki-imx6-1.conf
index 0e190c5..e71b80d 100644
--- a/conf/machine/phyboard-nunki-imx6-1.conf
+++ b/conf/machine/phyboard-nunki-imx6-1.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-nunki-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-nunki-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can"
diff --git a/conf/machine/phyboard-polaris-imx8m-2.conf b/conf/machine/phyboard-polaris-imx8m-2.conf
deleted file mode 100644
index 1dc759f..0000000
--- a/conf/machine/phyboard-polaris-imx8m-2.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#@TYPE: Machine
-#@NAME: phyboard-polaris-imx8m-2
-#@DESCRIPTION: PHYTEC phyBOARD-POLARIS i.MX8M Quad 1GB RAM, 4GB eMMC (deprecated)
-#@ARTICLENUMBERS: PB-02419-010I.A1
-
-MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
-
-include conf/machine/include/imx-base.inc
-include conf/machine/include/phyimx8.inc
-require conf/machine/include/arm/arch-arm64.inc
-
-MACHINE_FEATURES += " emmc pci wifi bluetooth"
-
-KERNEL_DEVICETREE = "freescale/phytec-imx8mq-phyboard-polaris-rdk-emmc-rev1.dtb freescale/phytec-imx8mq-phyboard-polaris-rdk-emmc-sterling-rev1.dtb"
-
-# Set DDR FIRMWARE
-DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "pcl066_defconfig,sdcard"
-UBOOT_CONFIG[mfgtool] = "pcl066_defconfig"
-SPL_BINARY = "spl/u-boot-spl.bin"
-
-# Set u-boot DTB
-UBOOT_DTB_NAME = "phytec-phycore-imx8mq.dtb"
-
-# Set imx-mkimage boot target
-IMXBOOT_TARGETS = "flash_evk"
-
-# Set Serial console
-SERIAL_CONSOLES = "115200;ttymxc0"
-
-IMAGE_BOOTLOADER = "imx-boot"
-
-DEFAULTTUNE_mx8 = "aarch64"
-
-IMX_DEFAULT_KERNEL = "linux-imx"
-
-KERNEL_IMAGETYPE = "Image"
-
-LOADADDR = ""
-UBOOT_SUFFIX = "bin"
-UBOOT_MAKE_TARGET = ""
diff --git a/conf/machine/phyboard-polaris-imx8m-3.conf b/conf/machine/phyboard-polaris-imx8m-3.conf
index c3e3e95..ee7306d 100644
--- a/conf/machine/phyboard-polaris-imx8m-3.conf
+++ b/conf/machine/phyboard-polaris-imx8m-3.conf
@@ -7,22 +7,21 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
include conf/machine/include/imx-base.inc
include conf/machine/include/phyimx8.inc
-require conf/machine/include/arm/arch-arm64.inc
+require conf/machine/include/tune-cortexa53.inc
MACHINE_FEATURES += " emmc pci wifi bluetooth"
-KERNEL_DEVICETREE = "freescale/phytec-imx8mq-phyboard-polaris-rdk-emmc.dtb freescale/phytec-imx8mq-phyboard-polaris-rdk-emmc-sterling.dtb"
+KERNEL_DEVICETREE = "freescale/imx8mq-phyboard-polaris-rdk-emmc.dtb freescale/imx8mq-phyboard-polaris-rdk-emmc-sterling.dtb"
# Set DDR FIRMWARE
DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "pcl066_defconfig,sdcard"
-UBOOT_CONFIG[mfgtool] = "pcl066_defconfig"
+UBOOT_CONFIG[sd] = "phycore-imx8mq_defconfig,sdcard"
SPL_BINARY = "spl/u-boot-spl.bin"
# Set u-boot DTB
-UBOOT_DTB_NAME = "phytec-phycore-imx8mq.dtb"
+UBOOT_DTB_NAME = "phycore-imx8mq.dtb"
# Set imx-mkimage boot target
IMXBOOT_TARGETS = "flash_evk"
diff --git a/conf/machine/phyboard-polis-imx8mm-2.conf b/conf/machine/phyboard-polis-imx8mm-3.conf
index 778b7c0..bb42e15 100644
--- a/conf/machine/phyboard-polis-imx8mm-2.conf
+++ b/conf/machine/phyboard-polis-imx8mm-3.conf
@@ -1,31 +1,32 @@
#@TYPE: Machine
-#@NAME: phyboard-polis-imx8mm-2
+#@NAME: phyboard-polis-imx8mm-3
#@DESCRIPTION: PHYTEC phyBOARD-POLIS i.MX8M Mini 2GB RAM, 16GB eMMC
-#@ARTICLENUMBERS: PB-02820.A1
+#@ARTICLENUMBERS: PB-02820.A2
MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
require conf/machine/include/imx-base.inc
include conf/machine/include/phyimx8.inc
-require conf/machine/include/arm/arch-arm64.inc
+require conf/machine/include/tune-cortexa53.inc
MACHINE_FEATURES += " emmc pci wifi bluetooth can"
-KERNEL_DEVICETREE = "freescale/phytec-imx8mm-phyboard-polis-rdk.dtb"
+KERNEL_DEVICETREE = "freescale/imx8mm-phyboard-polis-rdk.dtb"
# Set DDR FIRMWARE
DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "phycore-imx8mm_defconfig,sdcard"
-UBOOT_CONFIG[mfgtool] = "phycore-imx8mm_defconfig"
+#UBOOT_CONFIG[fspi] = "phycore-imx8mm_fspi_defconfig"
SPL_BINARY = "spl/u-boot-spl.bin"
# Set u-boot DTB
-UBOOT_DTB_NAME = "phytec-phycore-imx8mm.dtb"
+UBOOT_DTB_NAME = "phycore-imx8mm.dtb"
# Set imx-mkimage boot target
IMXBOOT_TARGETS = "flash_evk"
+PREFERRED_VERSION_imx-atf = "2.0%"
# Set Serial console
SERIAL_CONSOLES = "115200;ttymxc2"
@@ -38,8 +39,5 @@ IMX_DEFAULT_KERNEL = "linux-imx"
KERNEL_IMAGETYPE = "Image"
-BOOT_SPACE = "32768"
-
LOADADDR = ""
-UBOOT_SUFFIX = "bin"
UBOOT_MAKE_TARGET = ""
diff --git a/conf/machine/phyboard-polis-imx8mm-1.conf b/conf/machine/phyboard-polis-imx8mn-1.conf
index 4a76db3..4aa22f7 100644
--- a/conf/machine/phyboard-polis-imx8mm-1.conf
+++ b/conf/machine/phyboard-polis-imx8mn-1.conf
@@ -1,31 +1,33 @@
#@TYPE: Machine
-#@NAME: phyboard-polis-imx8mm-1
-#@DESCRIPTION: PHYTEC phyBOARD-POLIS i.MX8M Mini 2GB RAM, 16GB eMMC (deprecated)
-#@ARTICLENUMBERS: PB-02820.A0
+#@NAME: phyboard-polis-imx8mn-1
+#@DESCRIPTION: PHYTEC phyBOARD-POLIS i.MX8M NANO SL 1GB RAM, 4GB eMMC, MIPI
+#@ARTICLENUMBERS: PCL-069-0611010C
-MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
+MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:"
require conf/machine/include/imx-base.inc
include conf/machine/include/phyimx8.inc
-require conf/machine/include/arm/arch-arm64.inc
+require conf/machine/include/tune-cortexa53.inc
MACHINE_FEATURES += " emmc pci wifi bluetooth can"
-KERNEL_DEVICETREE = "freescale/phytec-imx8mm-phyboard-polis-rdk-alpha1.dtb"
+KERNEL_DEVICETREE = "freescale/imx8mn-phyboard-polis-rdk.dtb"
# Set DDR FIRMWARE
DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "phycore-imx8mm_defconfig,sdcard"
-UBOOT_CONFIG[mfgtool] = "phycore-imx8mm_defconfig"
+UBOOT_CONFIG[sd] = "phycore-imx8mn_defconfig,sdcard"
SPL_BINARY = "spl/u-boot-spl.bin"
+WKS_FILES_mx8m ?= "imx8mn-sdimage.wks"
+
# Set u-boot DTB
-UBOOT_DTB_NAME = "phytec-phycore-imx8mm.dtb"
+UBOOT_DTB_NAME = "phycore-imx8mn.dtb"
# Set imx-mkimage boot target
IMXBOOT_TARGETS = "flash_evk"
+PREFERRED_VERSION_imx-atf = "2.0%"
# Set Serial console
SERIAL_CONSOLES = "115200;ttymxc2"
@@ -38,8 +40,5 @@ IMX_DEFAULT_KERNEL = "linux-imx"
KERNEL_IMAGETYPE = "Image"
-BOOT_SPACE = "32768"
-
LOADADDR = ""
-UBOOT_SUFFIX = "bin"
UBOOT_MAKE_TARGET = ""
diff --git a/conf/machine/phyboard-segin-imx6ul-2.conf b/conf/machine/phyboard-segin-imx6ul-2.conf
index e7a8da9..6d6d7bb 100644
--- a/conf/machine/phyboard-segin-imx6ul-2.conf
+++ b/conf/machine/phyboard-segin-imx6ul-2.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ul-phytec-segin-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ul-nand-512mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ul-nand-512mb"
MACHINE_FEATURES += "resistivetouch can alsa wifi"
diff --git a/conf/machine/phyboard-segin-imx6ul-3.conf b/conf/machine/phyboard-segin-imx6ul-3.conf
index 4e6345b..bb7b489 100644
--- a/conf/machine/phyboard-segin-imx6ul-3.conf
+++ b/conf/machine/phyboard-segin-imx6ul-3.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ull-phytec-segin-lc-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ull-lc-nand-256mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ull-lc-nand-256mb"
MACHINE_FEATURES += "resistivetouch can alsa"
diff --git a/conf/machine/phyboard-segin-imx6ul-4.conf b/conf/machine/phyboard-segin-imx6ul-4.conf
index 74cd7eb..7e2ced4 100644
--- a/conf/machine/phyboard-segin-imx6ul-4.conf
+++ b/conf/machine/phyboard-segin-imx6ul-4.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ul-phytec-segin-ff-rdk-nand-rs485.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ul-nand-512mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ul-nand-512mb"
MACHINE_FEATURES += "resistivetouch can alsa wifi"
diff --git a/conf/machine/phyboard-segin-imx6ul-5.conf b/conf/machine/phyboard-segin-imx6ul-5.conf
index 5c895cd..c3a8018 100644
--- a/conf/machine/phyboard-segin-imx6ul-5.conf
+++ b/conf/machine/phyboard-segin-imx6ul-5.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ul-phytec-segin-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ul-nand-512mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ul-nand-512mb"
MACHINE_FEATURES += "resistivetouch can alsa wifi"
diff --git a/conf/machine/phyboard-segin-imx6ul-6.conf b/conf/machine/phyboard-segin-imx6ul-6.conf
index 9be898c..fe70b93 100644
--- a/conf/machine/phyboard-segin-imx6ul-6.conf
+++ b/conf/machine/phyboard-segin-imx6ul-6.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ull-phytec-segin-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ull-nand-512mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ull-nand-512mb"
MACHINE_FEATURES += "resistivetouch can alsa wifi"
diff --git a/conf/machine/phyboard-segin-imx6ul-7.conf b/conf/machine/phyboard-segin-imx6ul-7.conf
index 69a149f..4a51d0a 100644
--- a/conf/machine/phyboard-segin-imx6ul-7.conf
+++ b/conf/machine/phyboard-segin-imx6ul-7.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ull-phytec-segin-ff-rdk-emmc.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ull-emmc-512mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ull-emmc-512mb"
MACHINE_FEATURES += "resistivetouch can alsa wifi emmc"
diff --git a/conf/machine/phyboard-segin-imx6ul-8.conf b/conf/machine/phyboard-segin-imx6ul-8.conf
new file mode 100644
index 0000000..7082673
--- /dev/null
+++ b/conf/machine/phyboard-segin-imx6ul-8.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: phyboard-segin-imx6ul-8
+#@DESCRIPTION: PHYTEC phyBOARD-Segin i.MX6 UltraLight, 512MB RAM, eMMC
+#@ARTICLENUMBERS: PB-02013-510I.A0, PCL-063-20420CI.A0
+
+require conf/machine/include/phyimx6ul.inc
+
+SOC_FAMILY .= ":phyboard-segin-imx6ul"
+
+# Kernel
+KERNEL_DEVICETREE = "imx6ul-phytec-segin-ff-rdk-emmc.dtb"
+
+# Barebox Config
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ul-emmc-512mb"
+
+MACHINE_FEATURES += "resistivetouch can alsa emmc"
diff --git a/conf/machine/phycard-imx6-2.conf b/conf/machine/phycard-imx6-2.conf
new file mode 100644
index 0000000..dcb2923
--- /dev/null
+++ b/conf/machine/phycard-imx6-2.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: phycard-imx6-2
+#@DESCRIPTION: PHYTEC phyCARD-i.MX6 Quad 1GiB RAM one bank, 1GB NAND
+#@ARTICLENUMBERS: PCA-A-XL3-KSP02.A4-A6
+
+require conf/machine/include/phyimx6qdl.inc
+
+SOC_FAMILY .= ":mx6q"
+SOC_FAMILY .= ":phycard-imx6"
+
+# Kernel
+KERNEL_DEVICETREE = "imx6q-phytec-phycard.dtb"
+
+# Barebox Config
+BAREBOX_BIN = "images/barebox-phytec-phycard-imx6q-1gib-1bank.img"
+
+SERIAL_CONSOLES = "115200;ttymxc2"
diff --git a/conf/machine/phycore-imx8-2.conf b/conf/machine/phycore-imx8-2.conf
index f4fa020..14dcee2 100644
--- a/conf/machine/phycore-imx8-2.conf
+++ b/conf/machine/phycore-imx8-2.conf
@@ -7,10 +7,12 @@ MACHINEOVERRIDES =. "mx8:mx8qm:"
include conf/machine/include/imx-base.inc
include conf/machine/include/phyimx8.inc
-require conf/machine/include/arm/arch-arm64.inc
+require conf/machine/include/tune-cortexa53.inc
MACHINE_FEATURES_append = " emmc pci can bluetooth wifi"
+PREFERRED_RPROVIDER_linux-firmware-bcm43430 = "laird-sterling-etsi"
+
# Don't include kernels in standard images
RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
RDEPENDS_${KERNEL_PACKAGE_NAME}-image = ""
@@ -41,4 +43,4 @@ IMXBOOT_TARGETS_SD = "flash"
IMXBOOT_TARGETS = "${IMXBOOT_TARGETS_SD}"
#WIC
-IMAGE_BOOT_FILES = "Image ${@parse_dtbs(d)} hdmitxfw.bin hdmirxfw.bin dpfw.bin"
+IMAGE_BOOT_FILES += " hdmitxfw.bin hdmirxfw.bin dpfw.bin"
diff --git a/conf/machine/phycore-rk3288-4.conf b/conf/machine/phycore-rk3288-4.conf
deleted file mode 100644
index 2594115..0000000
--- a/conf/machine/phycore-rk3288-4.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: phycore-rk3288-4
-#@DESCRIPTION: RK3288 Webbox HW, AI Kit 1
-#@ARTICLENUMBERS:
-
-include conf/machine/include/phyrk3288.inc
-
-KERNEL_DEVICETREE = "rk3288-wbox.dtb"
-
-UBOOT_MACHINE = "phycore-rk3288_defconfig"
-
-MACHINE_FEATURES += "emmc alsa"
-
-WKS_FILES_rk3288 = "rk3288-sdimage.wks"
diff --git a/conf/machine/phycore-stm32mp1-1.conf b/conf/machine/phycore-stm32mp1-1.conf
index 37908a5..9db8ea2 100644
--- a/conf/machine/phycore-stm32mp1-1.conf
+++ b/conf/machine/phycore-stm32mp1-1.conf
@@ -1,9 +1,10 @@
-
#@TYPE: Machine
#@NAME: phycore-stm32mp1-1
-#@DESCRIPTION: Configuration for phyCORE-STM32MP1-1 Dev Board - PCM-068-1534-0-00/PCM-939-1517-1-002 (Trusted boot and SDcard only)
-#@NEEDED_BSPLAYERS:
+#@DESCRIPTION: PHYTEC phyCORE-STM32MP1 ALPHA1-Kit - stm32mp157aac @650Mhz MPU (old rev), 3D GPU, 1GiB RAM, 8GiB eMMC
+#@BOOTSCHEME: SD-Card and NOR-eMMC (Basic and Trusted boot support)
+#@ARTICLENUMBERS: PCM-068-1534-0, PCM-939-1517.1
+require conf/machine/include/phytec-machine-extlinux-config-phycore-stm32mp1-1.inc
include conf/machine/include/phytec-machine-common-stm32mp.inc
MACHINEOVERRIDES .= ":phycore"
@@ -20,12 +21,12 @@ include conf/machine/include/tune-cortexa7.inc
# =========================================================================
# boot scheme
# =========================================================================
-#BOOTSCHEME_LABELS += "basic"
+BOOTSCHEME_LABELS += "basic"
BOOTSCHEME_LABELS += "trusted"
#BOOTSCHEME_LABELS += "optee"
-PREFERRED_VERSION_u-boot-stm32mp = "2018.11"
+#PREFERRED_VERSION_u-boot-stm32mp = "2018.11"
# =========================================================================
# Machine settings
@@ -35,8 +36,8 @@ STM32MP_DT_FILES_PHYCORE += "phycore-stm32mp1-1"
# =========================================================================
# Machine features
# =========================================================================
-MACHINE_FEATURES += "bluetooth"
-MACHINE_FEATURES += "wifi"
+#MACHINE_FEATURES += "bluetooth"
+#MACHINE_FEATURES += "wifi"
MACHINE_FEATURES += "${@'gpu' if d.getVar('ACCEPT_EULA_'+d.getVar('MACHINE')) == '1' else ''}"
# Splashscreen enabled
MACHINE_FEATURES += "splashscreen"
@@ -63,17 +64,13 @@ ST_KERNEL_LOADADDR = "0xC2000040"
LINUX_A7_EXAMPLES_DT += "phycore-stm32mp1-1-a7-examples"
-PREFERRED_VERSION_linux-stm32mp = "4.19"
+#PREFERRED_VERSION_linux-stm32mp = "4.19"
# =========================================================================
# flashlayout
# =========================================================================
# Define the config labels to use to generate flashlayout file
-#FLASHLAYOUT_CONFIG_LABELS += "emmc"
-#FLASHLAYOUT_CONFIG_LABELS += "nand-4-256"
-#FLASHLAYOUT_CONFIG_LABELS += "nor-sdcard"
FLASHLAYOUT_CONFIG_LABELS += "nor-emmc"
-#FLASHLAYOUT_CONFIG_LABELS += "nor-nand-4-256"
FLASHLAYOUT_CONFIG_LABELS += "sdcard"
# =========================================================================
@@ -89,5 +86,26 @@ M4_BOARDS = "STM32MP157C-PHY"
# extlinux configuration
# =========================================================================
# As example, modify the default boot config for each target to M4 config
-UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-1_sdcard = "phycore-stm32mp1-examples-sdcard"
-UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-1_sdcard-optee = "phycore-stm32mp1-m4-examples-sdcard-optee"
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-1_sdcard = "phycore-stm32mp1-1-m4-examples-sdcard"
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-1_sdcard-optee = "phycore-stm32mp1-1-m4-examples-sdcard-optee"
+
+# =========================================================================
+# WIC for sdcard raw image
+# =========================================================================
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS ?= " \
+ u-boot-stm32mp \
+ tf-a-stm32mp \
+ ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee-os-stm32mp', '', d)} \
+ st-image-bootfs \
+ st-image-vendorfs \
+ st-image-userfs \
+"
+# for generated a WIC file, please uncomment the 7 following lines
+#IMAGE_FSTYPES += "wic"
+#WKS_FILE_openstlinux-tiny += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-tiny-phycore-stm32mp1-1-optee-1GB.wks', 'sdcard-tiny-phycore-stm32mp1-1-trusted-1GB.wks', d)}"
+#WKS_FILE_openstlinux-eglfs += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-eglfs-phycore-stm32mp1-1-optee-1GB.wks', 'sdcard-eglfs-phycore-stm32mp1-1-trusted-1GB.wks', d)}"
+#WKS_FILE_openstlinux-weston += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-weston-phycore-stm32mp1-1-optee-1GB.wks', 'sdcard-weston-phycore-stm32mp1-1-trusted-1GB.wks', d)"
diff --git a/conf/machine/phycore-stm32mp1-2.conf b/conf/machine/phycore-stm32mp1-2.conf
new file mode 100644
index 0000000..e944461
--- /dev/null
+++ b/conf/machine/phycore-stm32mp1-2.conf
@@ -0,0 +1,115 @@
+#@TYPE: Machine
+#@NAME: phycore-stm32mp1-2
+#@DESCRIPTION: PHYTEC phyCORE-STM32MP1 ALPHA2-Kit, stm32mp157aac @650Mhz MPU (old rev), 3D GPU, 1GiB RAM, 8GiB eMMC
+#@BOOTSCHEME: SD-Card and NOR-eMMC (Basic and Trusted boot support)
+#@ARTICLENUMBERS: PCM-068-1534-0, PCM-939-1517-2
+
+require conf/machine/include/phytec-machine-extlinux-config-phycore-stm32mp1-2.inc
+include conf/machine/include/phytec-machine-common-stm32mp.inc
+
+MACHINEOVERRIDES .= ":phycore"
+
+EULA_FILE_ST_stm32mpcommon = "${PHYCORE_STM32MP_BASE}/conf/eula/${MACHINE}"
+EULA_FILE_ST_MD5SUM_stm32mpcommon = "8b505090fb679839cefbcc784afe8ce9"
+
+# =========================================================================
+# Chip architecture
+# =========================================================================
+DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
+include conf/machine/include/tune-cortexa7.inc
+
+# =========================================================================
+# boot scheme
+# =========================================================================
+BOOTSCHEME_LABELS += "basic"
+BOOTSCHEME_LABELS += "trusted"
+#BOOTSCHEME_LABELS += "optee"
+
+
+#PREFERRED_VERSION_u-boot-stm32mp = "2018.11"
+
+# =========================================================================
+# Machine settings
+# =========================================================================
+STM32MP_DT_FILES_PHYCORE += "phycore-stm32mp1-2"
+
+# =========================================================================
+# Machine features
+# =========================================================================
+MACHINE_FEATURES += "bluetooth"
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "hdmi"
+MACHINE_FEATURES += "${@'gpu' if d.getVar('ACCEPT_EULA_'+d.getVar('MACHINE')) == '1' else ''}"
+# Splashscreen enabled
+MACHINE_FEATURES += "splashscreen"
+
+# =========================================================================
+# Image
+# =========================================================================
+# Add ubi FSTYPES to default ones for nand volumes
+#IMAGE_FSTYPES += "stmultiubi"
+
+# =========================================================================
+# Kernel
+# =========================================================================
+# Kernel config
+# Set this address to 0xC2000040, which is 0xC2000000 + 0x40.
+# 0xC2000000 is the memory address where U-Boot will copy from flash the file uImage and 0x40 is uImage header size (64Bytes).
+# With this value, U-Boot will be able to execute in place the zImage contained in uImage.
+ST_KERNEL_LOADADDR = "0xC2000040"
+
+# For eval board: auto-load goodix module (touchscreen module)
+#KERNEL_MODULE_AUTOLOAD = "goodix"
+
+# Define the devicetree for Linux A7 examples
+LINUX_A7_EXAMPLES_DT += "phycore-stm32mp1-2-a7-examples"
+
+
+#PREFERRED_VERSION_linux-stm32mp = "4.19"
+
+# =========================================================================
+# flashlayout
+# =========================================================================
+# Define the config labels to use to generate flashlayout file
+FLASHLAYOUT_CONFIG_LABELS += "nor-emmc"
+FLASHLAYOUT_CONFIG_LABELS += "sdcard"
+
+# =========================================================================
+# M4 copro
+# =========================================================================
+# Define the devicetree for M4 example
+CUBE_M4_EXAMPLES_DT += "phycore-stm32mp1-2-m4-examples"
+
+# Define specific board reference to use
+M4_BOARDS = "STM32MP157C-PHY"
+
+# =========================================================================
+# extlinux configuration
+# =========================================================================
+# As example, modify the default boot config for each target to M4 config
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-2_sdcard = "phycore-stm32mp1-2-m4-examples-sdcard"
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-2_sdcard-optee = "phycore-stm32mp1-2-m4-examples-sdcard-optee"
+
+# EDID firmware. This variable can be used to force specific HDMI screen resolution.
+#HDMI_EDID_KERNEL_ARGS = "drm_kms_helper.edid_firmware=HDMI-A-1:edid/1280x720.bin"
+
+# =========================================================================
+# WIC for sdcard raw image
+# =========================================================================
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS ?= " \
+ u-boot-stm32mp \
+ tf-a-stm32mp \
+ ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee-os-stm32mp', '', d)} \
+ st-image-bootfs \
+ st-image-vendorfs \
+ st-image-userfs \
+"
+# for generated a WIC file, please uncomment the 7 following lines
+#IMAGE_FSTYPES += "wic"
+#WKS_FILE_openstlinux-tiny += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-tiny-phycore-stm32mp1-2-optee-1GB.wks', 'sdcard-tiny-phycore-stm32mp1-2-trusted-1GB.wks', d)}"
+#WKS_FILE_openstlinux-eglfs += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-eglfs-phycore-stm32mp1-2-optee-1GB.wks', 'sdcard-eglfs-phycore-stm32mp1-2-trusted-1GB.wks', d)}"
+#WKS_FILE_openstlinux-weston += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-weston-phycore-stm32mp1-2-optee-1GB.wks', 'sdcard-weston-phycore-stm32mp1-2-trusted-1GB.wks', d)" 'sdcard-tiny-phycore-stm32mp1-2-optee-1GB.wks', 'sdcard-tiny-phycore-stm32mp1-2-trusted-1GB.wks', d)}"
diff --git a/conf/machine/phycore-stm32mp1-3.conf b/conf/machine/phycore-stm32mp1-3.conf
new file mode 100644
index 0000000..d78598b
--- /dev/null
+++ b/conf/machine/phycore-stm32mp1-3.conf
@@ -0,0 +1,116 @@
+#@TYPE: Machine
+#@NAME: phycore-stm32mp1-3
+#@DESCRIPTION: PHYTEC phyCORE-STM32MP1 phyBOARD-Sargas full-featured, stm32mp157cac @650Mhz MPU, 3D GPU, 1GiB RAM, 8GiB eMMC, 16MB QSPI NOR
+#@BOOTSCHEME: SD-Card, eMMC and NOR flash (Basic and Trusted boot support)
+#@ARTICLENUMBERS: PCM-068-025113I.A0, PCM-939-1517.2
+
+require conf/machine/include/phytec-machine-extlinux-config-phycore-stm32mp1-3.inc
+include conf/machine/include/phytec-machine-common-stm32mp.inc
+
+MACHINEOVERRIDES .= ":phycore"
+
+EULA_FILE_ST_stm32mpcommon = "${PHYCORE_STM32MP_BASE}/conf/eula/${MACHINE}"
+EULA_FILE_ST_MD5SUM_stm32mpcommon = "8b505090fb679839cefbcc784afe8ce9"
+
+# =========================================================================
+# Chip architecture
+# =========================================================================
+DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
+include conf/machine/include/tune-cortexa7.inc
+
+# =========================================================================
+# boot scheme
+# =========================================================================
+BOOTSCHEME_LABELS += "basic"
+BOOTSCHEME_LABELS += "trusted"
+#BOOTSCHEME_LABELS += "optee"
+
+
+#PREFERRED_VERSION_u-boot-stm32mp = "2018.11"
+
+# =========================================================================
+# Machine settings
+# =========================================================================
+STM32MP_DT_FILES_PHYCORE += "phycore-stm32mp1-3"
+
+# =========================================================================
+# Machine features
+# =========================================================================
+MACHINE_FEATURES += "bluetooth"
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "hdmi"
+MACHINE_FEATURES += "${@'gpu' if d.getVar('ACCEPT_EULA_'+d.getVar('MACHINE')) == '1' else ''}"
+# Splashscreen enabled
+MACHINE_FEATURES += "splashscreen"
+
+# =========================================================================
+# Image
+# =========================================================================
+# Add ubi FSTYPES to default ones for nand volumes
+#IMAGE_FSTYPES += "stmultiubi"
+
+# =========================================================================
+# Kernel
+# =========================================================================
+# Kernel config
+# Set this address to 0xC2000040, which is 0xC2000000 + 0x40.
+# 0xC2000000 is the memory address where U-Boot will copy from flash the file uImage and 0x40 is uImage header size (64Bytes).
+# With this value, U-Boot will be able to execute in place the zImage contained in uImage.
+ST_KERNEL_LOADADDR = "0xC2000040"
+
+# For eval board: auto-load goodix module (touchscreen module)
+#KERNEL_MODULE_AUTOLOAD = "goodix"
+
+# Define the devicetree for Linux A7 examples
+LINUX_A7_EXAMPLES_DT += "phycore-stm32mp1-3-a7-examples"
+
+
+#PREFERRED_VERSION_linux-stm32mp = "4.19"
+
+# =========================================================================
+# flashlayout
+# =========================================================================
+# Define the config labels to use to generate flashlayout file
+FLASHLAYOUT_CONFIG_LABELS += "emmc"
+FLASHLAYOUT_CONFIG_LABELS += "nor-emmc"
+FLASHLAYOUT_CONFIG_LABELS += "sdcard"
+
+# =========================================================================
+# M4 copro
+# =========================================================================
+# Define the devicetree for M4 example
+CUBE_M4_EXAMPLES_DT += "phycore-stm32mp1-3-m4-examples"
+
+# Define specific board reference to use
+M4_BOARDS = "STM32MP157C-PHY"
+
+# =========================================================================
+# extlinux configuration
+# =========================================================================
+# As example, modify the default boot config for each target to M4 config
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-3_sdcard = "phycore-stm32mp1-3-m4-examples-sdcard"
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-3_sdcard-optee = "phycore-stm32mp1-3-m4-examples-sdcard-optee"
+
+# EDID firmware. This variable can be used to force specific HDMI screen resolution.
+#HDMI_EDID_KERNEL_ARGS = "drm_kms_helper.edid_firmware=HDMI-A-1:edid/1280x720.bin"
+
+# =========================================================================
+# WIC for sdcard raw image
+# =========================================================================
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS ?= " \
+ u-boot-stm32mp \
+ tf-a-stm32mp \
+ ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee-os-stm32mp', '', d)} \
+ st-image-bootfs \
+ st-image-vendorfs \
+ st-image-userfs \
+"
+# for generated a WIC file, please uncomment the 7 following lines
+#IMAGE_FSTYPES += "wic"
+#WKS_FILE_openstlinux-tiny += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-tiny-phycore-stm32mp1-3-optee-1GB.wks', 'sdcard-tiny-phycore-stm32mp1-3-trusted-1GB.wks', d)}"
+#WKS_FILE_openstlinux-eglfs += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-eglfs-phycore-stm32mp1-3-optee-1GB.wks', 'sdcard-eglfs-phycore-stm32mp1-3-trusted-1GB.wks', d)}"
+#WKS_FILE_openstlinux-weston += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-weston-phycore-stm32mp1-3-optee-1GB.wks', 'sdcard-weston-phycore-stm32mp1-3-trusted-1GB.wks', d)"
diff --git a/conf/machine/phycore-stm32mp1-4.conf b/conf/machine/phycore-stm32mp1-4.conf
new file mode 100644
index 0000000..7ef0096
--- /dev/null
+++ b/conf/machine/phycore-stm32mp1-4.conf
@@ -0,0 +1,116 @@
+#@TYPE: Machine
+#@NAME: phycore-stm32mp1-4
+#@DESCRIPTION: PHYTEC phyCORE-STM32MP1 phyBOARD-Sargas full-featured, stm32mp157fac @800Mhz MPU, 3D GPU, 1GiB RAM, 8GiB eMMC, 16MB QSPI NOR
+#@BOOTSCHEME: SD-Card, eMMC and NOR flash (Basic and Trusted boot support)
+#@ARTICLENUMBERS: PCM-068-625113I.A0, PCM-939-1517.2
+
+require conf/machine/include/phytec-machine-extlinux-config-phycore-stm32mp1-4.inc
+include conf/machine/include/phytec-machine-common-stm32mp.inc
+
+MACHINEOVERRIDES .= ":phycore"
+
+EULA_FILE_ST_stm32mpcommon = "${PHYCORE_STM32MP_BASE}/conf/eula/${MACHINE}"
+EULA_FILE_ST_MD5SUM_stm32mpcommon = "8b505090fb679839cefbcc784afe8ce9"
+
+# =========================================================================
+# Chip architecture
+# =========================================================================
+DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
+include conf/machine/include/tune-cortexa7.inc
+
+# =========================================================================
+# boot scheme
+# =========================================================================
+BOOTSCHEME_LABELS += "basic"
+BOOTSCHEME_LABELS += "trusted"
+#BOOTSCHEME_LABELS += "optee"
+
+
+#PREFERRED_VERSION_u-boot-stm32mp = "2018.11"
+
+# =========================================================================
+# Machine settings
+# =========================================================================
+STM32MP_DT_FILES_PHYCORE += "phycore-stm32mp1-4"
+
+# =========================================================================
+# Machine features
+# =========================================================================
+MACHINE_FEATURES += "bluetooth"
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "hdmi"
+MACHINE_FEATURES += "${@'gpu' if d.getVar('ACCEPT_EULA_'+d.getVar('MACHINE')) == '1' else ''}"
+# Splashscreen enabled
+MACHINE_FEATURES += "splashscreen"
+
+# =========================================================================
+# Image
+# =========================================================================
+# Add ubi FSTYPES to default ones for nand volumes
+#IMAGE_FSTYPES += "stmultiubi"
+
+# =========================================================================
+# Kernel
+# =========================================================================
+# Kernel config
+# Set this address to 0xC2000040, which is 0xC2000000 + 0x40.
+# 0xC2000000 is the memory address where U-Boot will copy from flash the file uImage and 0x40 is uImage header size (64Bytes).
+# With this value, U-Boot will be able to execute in place the zImage contained in uImage.
+ST_KERNEL_LOADADDR = "0xC2000040"
+
+# For eval board: auto-load goodix module (touchscreen module)
+#KERNEL_MODULE_AUTOLOAD = "goodix"
+
+# Define the devicetree for Linux A7 examples
+LINUX_A7_EXAMPLES_DT += "phycore-stm32mp1-4-a7-examples"
+
+
+#PREFERRED_VERSION_linux-stm32mp = "4.19"
+
+# =========================================================================
+# flashlayout
+# =========================================================================
+# Define the config labels to use to generate flashlayout file
+FLASHLAYOUT_CONFIG_LABELS += "emmc"
+FLASHLAYOUT_CONFIG_LABELS += "nor-emmc"
+FLASHLAYOUT_CONFIG_LABELS += "sdcard"
+
+# =========================================================================
+# M4 copro
+# =========================================================================
+# Define the devicetree for M4 example
+CUBE_M4_EXAMPLES_DT += "phycore-stm32mp1-4-m4-examples"
+
+# Define specific board reference to use
+M4_BOARDS = "STM32MP157C-PHY"
+
+# =========================================================================
+# extlinux configuration
+# =========================================================================
+# As example, modify the default boot config for each target to M4 config
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-4_sdcard = "phycore-stm32mp1-4-m4-examples-sdcard"
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-4_sdcard-optee = "phycore-stm32mp1-4-m4-examples-sdcard-optee"
+
+# EDID firmware. This variable can be used to force specific HDMI screen resolution.
+#HDMI_EDID_KERNEL_ARGS = "drm_kms_helper.edid_firmware=HDMI-A-1:edid/1280x720.bin"
+
+# =========================================================================
+# WIC for sdcard raw image
+# =========================================================================
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS ?= " \
+ u-boot-stm32mp \
+ tf-a-stm32mp \
+ ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee-os-stm32mp', '', d)} \
+ st-image-bootfs \
+ st-image-vendorfs \
+ st-image-userfs \
+"
+# for generated a WIC file, please uncomment the 7 following lines
+#IMAGE_FSTYPES += "wic"
+#WKS_FILE_openstlinux-tiny += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-tiny-phycore-stm32mp1-4-optee-1GB.wks', 'sdcard-tiny-phycore-stm32mp1-4-trusted-1GB.wks', d)}"
+#WKS_FILE_openstlinux-eglfs += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-eglfs-phycore-stm32mp1-4-optee-1GB.wks', 'sdcard-eglfs-phycore-stm32mp1-4-trusted-1GB.wks', d)}"
+#WKS_FILE_openstlinux-weston += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-weston-phycore-stm32mp1-4-optee-1GB.wks', 'sdcard-weston-phycore-stm32mp1-4-trusted-1GB.wks', d)"
diff --git a/conf/machine/phycore-stm32mp1-5.conf b/conf/machine/phycore-stm32mp1-5.conf
new file mode 100644
index 0000000..6c44321
--- /dev/null
+++ b/conf/machine/phycore-stm32mp1-5.conf
@@ -0,0 +1,113 @@
+#@TYPE: Machine
+#@NAME: phycore-stm32mp1-5
+#@DESCRIPTION: PHYTEC phyCORE-STM32MP1 phyBOARD-Sargas full featured, stm32mp153aac @650Mhz MPU, no 3D GPU, 1GiB RAM, 8GiB eMMC
+#@BOOTSCHEME: SD-Card, eMMC and NOR flash (Basic and Trusted boot support)
+#@ARTICLENUMBERS: PCM-068-325113I.A0, PCM-939-1517.2
+
+require conf/machine/include/phytec-machine-extlinux-config-phycore-stm32mp1-5.inc
+include conf/machine/include/phytec-machine-common-stm32mp.inc
+
+MACHINEOVERRIDES .= ":phycore"
+
+EULA_FILE_ST_stm32mpcommon = "${PHYCORE_STM32MP_BASE}/conf/eula/${MACHINE}"
+EULA_FILE_ST_MD5SUM_stm32mpcommon = "8b505090fb679839cefbcc784afe8ce9"
+
+# =========================================================================
+# Chip architecture
+# =========================================================================
+DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
+include conf/machine/include/tune-cortexa7.inc
+
+# =========================================================================
+# boot scheme
+# =========================================================================
+BOOTSCHEME_LABELS += "basic"
+BOOTSCHEME_LABELS += "trusted"
+#BOOTSCHEME_LABELS += "optee"
+
+
+#PREFERRED_VERSION_u-boot-stm32mp = "2018.11"
+
+# =========================================================================
+# Machine settings
+# =========================================================================
+STM32MP_DT_FILES_PHYCORE += "phycore-stm32mp1-5"
+
+# =========================================================================
+# Machine features
+# =========================================================================
+MACHINE_FEATURES += "bluetooth"
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "hdmi"
+# Splashscreen enabled
+MACHINE_FEATURES += "splashscreen"
+
+# =========================================================================
+# Image
+# =========================================================================
+# Add ubi FSTYPES to default ones for nand volumes
+#IMAGE_FSTYPES += "stmultiubi"
+
+# =========================================================================
+# Kernel
+# =========================================================================
+# Kernel config
+# Set this address to 0xC2000040, which is 0xC2000000 + 0x40.
+# 0xC2000000 is the memory address where U-Boot will copy from flash the file uImage and 0x40 is uImage header size (64Bytes).
+# With this value, U-Boot will be able to execute in place the zImage contained in uImage.
+ST_KERNEL_LOADADDR = "0xC2000040"
+
+# For eval board: auto-load goodix module (touchscreen module)
+#KERNEL_MODULE_AUTOLOAD = "goodix"
+
+# Define the devicetree for Linux A7 examples
+LINUX_A7_EXAMPLES_DT += "phycore-stm32mp1-5-a7-examples"
+
+
+#PREFERRED_VERSION_linux-stm32mp = "4.19"
+
+# =========================================================================
+# flashlayout
+# =========================================================================
+# Define the config labels to use to generate flashlayout file
+FLASHLAYOUT_CONFIG_LABELS += "emmc"
+FLASHLAYOUT_CONFIG_LABELS += "nor-emmc"
+FLASHLAYOUT_CONFIG_LABELS += "sdcard"
+
+# =========================================================================
+# M4 copro
+# =========================================================================
+# Define the devicetree for M4 example
+CUBE_M4_EXAMPLES_DT += "phycore-stm32mp1-5-m4-examples"
+
+# Define specific board reference to use
+M4_BOARDS = "STM32MP157C-PHY"
+
+# =========================================================================
+# extlinux configuration
+# =========================================================================
+# As example, modify the default boot config for each target to M4 config
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-5_sdcard = "phycore-stm32mp1-5-m4-examples-sdcard"
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-5_sdcard-optee = "phycore-stm32mp1-5-m4-examples-sdcard-optee"
+
+# EDID firmware. This variable can be used to force specific HDMI screen resolution.
+#HDMI_EDID_KERNEL_ARGS = "drm_kms_helper.edid_firmware=HDMI-A-1:edid/1280x720.bin"
+
+# =========================================================================
+# WIC for sdcard raw image
+# =========================================================================
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS ?= " \
+ u-boot-stm32mp \
+ tf-a-stm32mp \
+ ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee-os-stm32mp', '', d)} \
+ st-image-bootfs \
+ st-image-vendorfs \
+ st-image-userfs \
+"
+# for generated a WIC file, please uncomment the 5 following lines
+#IMAGE_FSTYPES += "wic"
+#WKS_FILE_openstlinux-tiny += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-tiny-phycore-stm32mp1-5-optee-1GB.wks', 'sdcard-tiny-phycore-stm32mp1-5-trusted-1GB.wks', d)}"
+#WKS_FILE_openstlinux-eglfs += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-eglfs-phycore-stm32mp1-5-optee-1GB.wks', 'sdcard-eglfs-phycore-stm32mp1-5-trusted-1GB.wks', d)}"
diff --git a/conf/machine/phycore-stm32mp1-6.conf b/conf/machine/phycore-stm32mp1-6.conf
new file mode 100644
index 0000000..929a64d
--- /dev/null
+++ b/conf/machine/phycore-stm32mp1-6.conf
@@ -0,0 +1,139 @@
+#@TYPE: Machine
+#@NAME: phycore-stm32mp1-6
+#@DESCRIPTION: PHYTEC phyCORE-STM32MP1 phyBOARD-Sargas low cost, stm32mp153aac @650Mhz MPU, no 3D GPU, 512MB RAM, 512MB NAND
+#@BOOTSCHEME: SD-Card (trusted and basic boot), NAND (Trusted boot)
+#@ARTICLENUMBERS: PCM-068-312011I.A0, PCM-939-1517.2
+
+require conf/machine/include/phytec-machine-extlinux-config-phycore-stm32mp1-6.inc
+include conf/machine/include/phytec-machine-common-stm32mp.inc
+
+MACHINEOVERRIDES .= ":phycore"
+
+EULA_FILE_ST_stm32mpcommon = "${PHYCORE_STM32MP_BASE}/conf/eula/${MACHINE}"
+EULA_FILE_ST_MD5SUM_stm32mpcommon = "8b505090fb679839cefbcc784afe8ce9"
+
+# =========================================================================
+# Chip architecture
+# =========================================================================
+DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
+include conf/machine/include/tune-cortexa7.inc
+
+# =========================================================================
+# boot scheme
+# =========================================================================
+BOOTSCHEME_LABELS += "basic"
+BOOTSCHEME_LABELS += "trusted"
+#BOOTSCHEME_LABELS += "optee"
+
+
+#PREFERRED_VERSION_u-boot-stm32mp = "2018.11"
+
+# =========================================================================
+# Machine settings
+# =========================================================================
+STM32MP_DT_FILES_PHYCORE += "phycore-stm32mp1-6"
+
+# =========================================================================
+# Machine features
+# =========================================================================
+MACHINE_FEATURES += "bluetooth"
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "hdmi"
+MACHINE_FEATURES += "nand"
+# Splashscreen enabled
+MACHINE_FEATURES += "splashscreen"
+
+# =========================================================================
+# Image
+# =========================================================================
+# Add ubi FSTYPES to default ones for nand volumes
+IMAGE_FSTYPES += "stmultiubi"
+
+# ST Naming rules partitions for UBI format are :
+# nand_<PageSize>_<BlockSize>
+# nor_<BlockSize>
+# Like that a same UBI partition can be used for severals NAND/NOR providers
+
+# UBI Args for NAND soldered by default on phyCORE-STM32mp1-6
+# Micron MT29F8G08ABACAWP
+# LEB = BLOCK_SIZE - (2 * page size): 64*2048 - (2*2048)
+MKUBIFS_ARGS_nand_2_256 = "--min-io-size 2048 --leb-size 126976 --max-leb-cnt 972 --space-fixup"
+UBINIZE_ARGS_nand_2_256 = "--min-io-size 2048 --peb-size 128KiB"
+EXTRA_UBIFS_SIZE_nand_2_256 = "2304"
+
+# Define UBI labels to build
+MULTIUBI_BUILD = "nand_2_256"
+
+# Define image partition size (supposed to be set as max size in image recipe)
+BOOTFS_PARTITION_SIZE = "32768"
+# New value proposed for rootfs is 384MB
+ROOTFS_PARTITION_SIZE = "393216"
+# If we consider the highest constraint is NAND size (so < 512MB)
+# Boot binaries 4 MB max (with optee) + bootfs 32 MB max + rootfs 384MB max + userfs size (64MB) < 512MB
+USERFS_PARTITION_SIZE = "65536"
+# New value proposed for vendorfs is 16MB
+VENDORFS_PARTITION_SIZE = "16384"
+
+
+# =========================================================================
+# Kernel
+# =========================================================================
+# Kernel config
+# Set this address to 0xC2000040, which is 0xC2000000 + 0x40.
+# 0xC2000000 is the memory address where U-Boot will copy from flash the file uImage and 0x40 is uImage header size (64Bytes).
+# With this value, U-Boot will be able to execute in place the zImage contained in uImage.
+ST_KERNEL_LOADADDR = "0xC2000040"
+
+# For eval board: auto-load goodix module (touchscreen module)
+#KERNEL_MODULE_AUTOLOAD = "goodix"
+
+# Define the devicetree for Linux A7 examples
+LINUX_A7_EXAMPLES_DT += "phycore-stm32mp1-6-a7-examples"
+
+
+#PREFERRED_VERSION_linux-stm32mp = "4.19"
+
+# =========================================================================
+# flashlayout
+# =========================================================================
+# Define the config labels to use to generate flashlayout file
+FLASHLAYOUT_CONFIG_LABELS += "nand-2-256"
+FLASHLAYOUT_CONFIG_LABELS += "sdcard"
+
+# =========================================================================
+# M4 copro
+# =========================================================================
+# Define the devicetree for M4 example
+CUBE_M4_EXAMPLES_DT += "phycore-stm32mp1-6-m4-examples"
+
+# Define specific board reference to use
+M4_BOARDS = "STM32MP157C-PHY"
+
+# =========================================================================
+# extlinux configuration
+# =========================================================================
+# As example, modify the default boot config for each target to M4 config
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-6_sdcard = "phycore-stm32mp1-6-m4-examples-sdcard"
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-6_sdcard-optee = "phycore-stm32mp1-6-m4-examples-sdcard-optee"
+
+# EDID firmware. This variable can be used to force specific HDMI screen resolution.
+#HDMI_EDID_KERNEL_ARGS = "drm_kms_helper.edid_firmware=HDMI-A-1:edid/1280x720.bin"
+
+# =========================================================================
+# WIC for sdcard raw image
+# =========================================================================
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS ?= " \
+ u-boot-stm32mp \
+ tf-a-stm32mp \
+ ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee-os-stm32mp', '', d)} \
+ st-image-bootfs \
+ st-image-vendorfs \
+ st-image-userfs \
+"
+# for generated a WIC file, please uncomment the 3 following lines
+#IMAGE_FSTYPES += "wic"
+#WKS_FILE_openstlinux-tiny += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-tiny-phycore-stm32mp1-6-optee-1GB.wks', 'sdcard-tiny-phycore-stm32mp1-6-trusted-1GB.wks', d)}"
+#WKS_FILE_openstlinux-eglfs += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-eglfs-phycore-stm32mp1-6-optee-1GB.wks', 'sdcard-eglfs-phycore-stm32mp1-6-trusted-1GB.wks', d)}"
diff --git a/conf/machine/phycore-stm32mp1-7.conf b/conf/machine/phycore-stm32mp1-7.conf
new file mode 100644
index 0000000..5116f97
--- /dev/null
+++ b/conf/machine/phycore-stm32mp1-7.conf
@@ -0,0 +1,138 @@
+#@TYPE: Machine
+#@NAME: phycore-stm32mp1-7
+#@DESCRIPTION: PHYTEC phyCORE-STM32mp1 phyBOARD-Sargas super low cost, stm32mp153aac @650Mhz MPU, no 3D GPU, 512MB RAM, 128MB NAND
+#@BOOTSCHEME: SD-Card (trusted and basic boot), NAND (trusted boot)
+#@ARTICLENUMBERS: PCM-068-510011I.A0, PCM-939-1517.2
+
+require conf/machine/include/phytec-machine-extlinux-config-phycore-stm32mp1-7.inc
+include conf/machine/include/phytec-machine-common-stm32mp.inc
+
+MACHINEOVERRIDES .= ":phycore"
+
+EULA_FILE_ST_stm32mpcommon = "${PHYCORE_STM32MP_BASE}/conf/eula/${MACHINE}"
+EULA_FILE_ST_MD5SUM_stm32mpcommon = "8b505090fb679839cefbcc784afe8ce9"
+
+# =========================================================================
+# Chip architecture
+# =========================================================================
+DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
+include conf/machine/include/tune-cortexa7.inc
+
+# =========================================================================
+# boot scheme
+# =========================================================================
+BOOTSCHEME_LABELS += "basic"
+BOOTSCHEME_LABELS += "trusted"
+#BOOTSCHEME_LABELS += "optee"
+
+
+#PREFERRED_VERSION_u-boot-stm32mp = "2018.11"
+
+# =========================================================================
+# Machine settings
+# =========================================================================
+STM32MP_DT_FILES_PHYCORE += "phycore-stm32mp1-7"
+
+# =========================================================================
+# Machine features
+# =========================================================================
+MACHINE_FEATURES += "bluetooth"
+MACHINE_FEATURES += "wifi"
+#MACHINE_FEATURES += "hdmi"
+MACHINE_FEATURES += "nand"
+
+# Splashscreen enabled
+#MACHINE_FEATURES += "splashscreen"
+
+# =========================================================================
+# Image
+# =========================================================================
+# Add ubi FSTYPES to default ones for nand volumes
+IMAGE_FSTYPES += "stmultiubi"
+
+# ST Naming rules partitions for UBI format are :
+# nand_<PageSize>_<BlockSize>
+# nor_<BlockSize>
+# Like that a same UBI partition can be used for severals NAND/NOR providers
+
+# UBI Args for NAND soldered by default on phyCORE-STM32mp1-7
+# Micron MT29F1G08ABAEAWP
+# LEB = BLOCK_SIZE - (2 * page size): 64*2048 - (2*2048)
+MKUBIFS_ARGS_nand_2_64 = "--min-io-size 2048 --leb-size 126976 --max-leb-cnt 972 --space-fixup"
+UBINIZE_ARGS_nand_2_64 = "--min-io-size 2048 --peb-size 128KiB"
+EXTRA_UBIFS_SIZE_nand_2_64 = "2304"
+
+# Define UBI labels to build
+MULTIUBI_BUILD = "nand_2_64"
+
+# Define image partition size (supposed to be set as max size in image recipe)
+BOOTFS_PARTITION_SIZE = "12288"
+# New value proposed for rootfs is 64MB
+ROOTFS_PARTITION_SIZE = "65536"
+# If we consider the highest constraint is NAND size (so < 128MB)
+# Boot binaries 4 MB max (with optee) + bootfs 12 MB max + rootfs 64 MB max + userfs size (16MB) < 128 MB
+USERFS_PARTITION_SIZE = "16384"
+# New value proposed for vendorfs is 16MB
+VENDORFS_PARTITION_SIZE = "16384"
+
+
+# =========================================================================
+# Kernel
+# =========================================================================
+# Kernel config
+# Set this address to 0xC2000040, which is 0xC2000000 + 0x40.
+# 0xC2000000 is the memory address where U-Boot will copy from flash the file uImage and 0x40 is uImage header size (64Bytes).
+# With this value, U-Boot will be able to execute in place the zImage contained in uImage.
+ST_KERNEL_LOADADDR = "0xC2000040"
+
+# For eval board: auto-load goodix module (touchscreen module)
+#KERNEL_MODULE_AUTOLOAD = "goodix"
+
+# Define the devicetree for Linux A7 examples
+LINUX_A7_EXAMPLES_DT += "phycore-stm32mp1-7-a7-examples"
+
+
+#PREFERRED_VERSION_linux-stm32mp = "4.19"
+
+# =========================================================================
+# flashlayout
+# =========================================================================
+# Define the config labels to use to generate flashlayout file
+FLASHLAYOUT_CONFIG_LABELS += "nand-2-64"
+FLASHLAYOUT_CONFIG_LABELS += "sdcard"
+
+# =========================================================================
+# M4 copro
+# =========================================================================
+# Define the devicetree for M4 example
+CUBE_M4_EXAMPLES_DT += "phycore-stm32mp1-7-m4-examples"
+
+# Define specific board reference to use
+M4_BOARDS = "STM32MP157C-PHY"
+
+# =========================================================================
+# extlinux configuration
+# =========================================================================
+# As example, modify the default boot config for each target to M4 config
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-7_sdcard = "phycore-stm32mp1-7-m4-examples-sdcard"
+#UBOOT_EXTLINUX_DEFAULT_LABEL_mp1-7_sdcard-optee = "phycore-stm32mp1-7-m4-examples-sdcard-optee"
+
+# EDID firmware. This variable can be used to force specific HDMI screen resolution.
+#HDMI_EDID_KERNEL_ARGS = "drm_kms_helper.edid_firmware=HDMI-A-1:edid/1280x720.bin"
+
+# =========================================================================
+# WIC for sdcard raw image
+# =========================================================================
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS ?= " \
+ u-boot-stm32mp \
+ tf-a-stm32mp \
+ ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee-os-stm32mp', '', d)} \
+ st-image-bootfs \
+ st-image-vendorfs \
+ st-image-userfs \
+"
+# for generated a WIC file, please uncomment the 3 following lines
+#IMAGE_FSTYPES += "wic"
+#WKS_FILE_openstlinux-tiny += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', \
+# 'sdcard-tiny-phycore-stm32mp1-7-optee-1GB.wks', 'sdcard-tiny-phycore-stm32mp1-7-trusted-1GB.wks', d)}"
diff --git a/conf/machine/phyflex-imx6-1.conf b/conf/machine/phyflex-imx6-1.conf
index e6c0a77..8db1572 100644
--- a/conf/machine/phyflex-imx6-1.conf
+++ b/conf/machine/phyflex-imx6-1.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-1gib"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-10.conf b/conf/machine/phyflex-imx6-10.conf
index a40430d..188c0af 100644
--- a/conf/machine/phyflex-imx6-10.conf
+++ b/conf/machine/phyflex-imx6-10.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-pbab01-nonor.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01s-128mb-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01s-128mb-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-11.conf b/conf/machine/phyflex-imx6-11.conf
index a647390..9f3c638 100644
--- a/conf/machine/phyflex-imx6-11.conf
+++ b/conf/machine/phyflex-imx6-11.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-4gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-4gib"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-2.conf b/conf/machine/phyflex-imx6-2.conf
index 60f233d..ed765eb 100644
--- a/conf/machine/phyflex-imx6-2.conf
+++ b/conf/machine/phyflex-imx6-2.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-1gib-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-1gib-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-3.conf b/conf/machine/phyflex-imx6-3.conf
index 727b278..1f9992f 100644
--- a/conf/machine/phyflex-imx6-3.conf
+++ b/conf/machine/phyflex-imx6-3.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-2gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-2gib"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-4.conf b/conf/machine/phyflex-imx6-4.conf
index d655a47..7217a61 100644
--- a/conf/machine/phyflex-imx6-4.conf
+++ b/conf/machine/phyflex-imx6-4.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-4gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-4gib"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-5.conf b/conf/machine/phyflex-imx6-5.conf
index 4a99bcd..321a160 100644
--- a/conf/machine/phyflex-imx6-5.conf
+++ b/conf/machine/phyflex-imx6-5.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-512mb-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-512mb-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-6.conf b/conf/machine/phyflex-imx6-6.conf
index 51d1a83..37d21b5 100644
--- a/conf/machine/phyflex-imx6-6.conf
+++ b/conf/machine/phyflex-imx6-6.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01dl-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01dl-1gib"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-7.conf b/conf/machine/phyflex-imx6-7.conf
index 6229382..f859fcf 100644
--- a/conf/machine/phyflex-imx6-7.conf
+++ b/conf/machine/phyflex-imx6-7.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01dl-1gib-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01dl-1gib-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-8.conf b/conf/machine/phyflex-imx6-8.conf
index 14f1aa9..2571465 100644
--- a/conf/machine/phyflex-imx6-8.conf
+++ b/conf/machine/phyflex-imx6-8.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-pbab01-nonor.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01s-512mb-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01s-512mb-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-9.conf b/conf/machine/phyflex-imx6-9.conf
index e74c352..9aad86a 100644
--- a/conf/machine/phyflex-imx6-9.conf
+++ b/conf/machine/phyflex-imx6-9.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-pbab01-nonor.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01s-256mb-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01s-256mb-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"