diff --git a/conf/machine/imx6dl-riotboard.conf b/conf/machine/imx6dl-riotboard.conf
new file mode 100644
index 0000000..fc6dd42
--- /dev/null
+++ b/conf/machine/imx6dl-riotboard.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: RIoTboard
+#@SOC: i.MX6S
+#@DESCRIPTION: Machine configuration for i.MX6S RIoTboard.
+#@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com>
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+SOC_FAMILY = "mx6:mx6dl"
+
+UBOOT_MACHINE = "riotboard_defconfig"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc"
+KERNEL_DEVICETREE = "imx6dl-riotboard.dtb"
+
+SERIAL_CONSOLE = "115200 ttymxc1"