diff --git a/conf/eula/stm32mp1-disco b/conf/eula/stm32mp1-disco
new file mode 120000
index 0000000..ab103d9
--- /dev/null
+++ b/conf/eula/stm32mp1-disco
@@ -0,0 +1 @@
+ST_EULA_SLA
\ No newline at end of file
diff --git a/conf/eula/stm32mp1-eval b/conf/eula/stm32mp1-eval
new file mode 120000
index 0000000..ab103d9
--- /dev/null
+++ b/conf/eula/stm32mp1-eval
@@ -0,0 +1 @@
+ST_EULA_SLA
\ No newline at end of file
diff --git a/conf/machine/stm32mp1-disco.conf b/conf/machine/stm32mp1-disco.conf
new file mode 100644
index 0000000..e6c7816
--- /dev/null
+++ b/conf/machine/stm32mp1-disco.conf
@@ -0,0 +1,87 @@
+#@TYPE: Machine
+#@NAME: stm32mp1-disco
+#@DESCRIPTION: Configuration for STM32MP157C-DK2 board (Trusted boot and SDcard only)
+#@NEEDED_BSPLAYERS:
+
+include conf/machine/include/st-machine-common-stm32mp.inc
+
+# =========================================================================
+# Chip architecture
+# =========================================================================
+DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
+include conf/machine/include/tune-cortexa7.inc
+
+# =========================================================================
+# boot scheme
+# =========================================================================
+#BOOTSCHEME_LABELS += "basic"
+BOOTSCHEME_LABELS += "trusted"
+#BOOTSCHEME_LABELS += "optee"
+
+# =========================================================================
+# Machine settings
+# =========================================================================
+# Define list of devicetree per board
+#STM32MP_DT_FILES_DK += "stm32mp157a-dk1"
+STM32MP_DT_FILES_DK += "stm32mp157c-dk2"
+#STM32MP_DT_FILES_ED += "stm32mp157c-ed1"
+#STM32MP_DT_FILES_EV += "stm32mp157c-ev1"
+
+# =========================================================================
+# Machine features
+# =========================================================================
+MACHINE_FEATURES += "bluetooth"
+MACHINE_FEATURES += "wifi"
+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 += "stm32mp157c-dk2-a7-examples"
+#LINUX_A7_EXAMPLES_DT += "stm32mp157c-ev1-a7-examples"
+
+# =========================================================================
+# 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"
+
+# =========================================================================
+# M4 copro
+# =========================================================================
+# Define the devicetree for M4 example
+CUBE_M4_EXAMPLES_DT += "stm32mp157c-dk2-m4-examples"
+#CUBE_M4_EXAMPLES_DT += "stm32mp157c-ev1-m4-examples"
+
+# Define specific board reference to use
+M4_BOARDS = "STM32MP157C-DK2"
+
+# =========================================================================
+# extlinux configuration
+# =========================================================================
+# As example, modify the default boot config for each target to M4 config
+UBOOT_EXTLINUX_DEFAULT_LABEL_mp157c-dk2_sdcard       = "stm32mp157c-dk2-m4-examples-sdcard"
+UBOOT_EXTLINUX_DEFAULT_LABEL_mp157c-dk2_sdcard-optee = "stm32mp157c-dk2-m4-examples-sdcard-optee"
diff --git a/conf/machine/stm32mp1-eval.conf b/conf/machine/stm32mp1-eval.conf
new file mode 100644
index 0000000..62a5d71
--- /dev/null
+++ b/conf/machine/stm32mp1-eval.conf
@@ -0,0 +1,87 @@
+#@TYPE: Machine
+#@NAME: stm32mp1-eval
+#@DESCRIPTION: Configuration for STM32MP157C-EV1 board (Trusted boot and SDcard only)
+#@NEEDED_BSPLAYERS:
+
+include conf/machine/include/st-machine-common-stm32mp.inc
+
+# =========================================================================
+# Chip architecture
+# =========================================================================
+DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
+include conf/machine/include/tune-cortexa7.inc
+
+# =========================================================================
+# boot scheme
+# =========================================================================
+#BOOTSCHEME_LABELS += "basic"
+BOOTSCHEME_LABELS += "trusted"
+#BOOTSCHEME_LABELS += "optee"
+
+# =========================================================================
+# Machine settings
+# =========================================================================
+# Define list of devicetree per board
+#STM32MP_DT_FILES_DK += "stm32mp157a-dk1"
+#STM32MP_DT_FILES_DK += "stm32mp157c-dk2"
+#STM32MP_DT_FILES_ED += "stm32mp157c-ed1"
+STM32MP_DT_FILES_EV += "stm32mp157c-ev1"
+
+# =========================================================================
+# Machine features
+# =========================================================================
+#MACHINE_FEATURES += "bluetooth"
+#MACHINE_FEATURES += "wifi"
+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 += "stm32mp157c-dk2-a7-examples"
+LINUX_A7_EXAMPLES_DT += "stm32mp157c-ev1-a7-examples"
+
+# =========================================================================
+# 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"
+
+# =========================================================================
+# M4 copro
+# =========================================================================
+# Define the devicetree for M4 example
+#CUBE_M4_EXAMPLES_DT += "stm32mp157c-dk2-m4-examples"
+CUBE_M4_EXAMPLES_DT += "stm32mp157c-ev1-m4-examples"
+
+# Define specific board reference to use
+M4_BOARDS = "STM32MP157C-EV1"
+
+# =========================================================================
+# extlinux configuration
+# =========================================================================
+# As example, modify the default boot config for each target to M4 config
+UBOOT_EXTLINUX_DEFAULT_LABEL_mp157c-ev1_sdcard       = "stm32mp157c-ev1-m4-examples-sdcard"
+UBOOT_EXTLINUX_DEFAULT_LABEL_mp157c-ev1_sdcard-optee = "stm32mp157c-ev1-m4-examples-sdcard-optee"