diff --git a/conf/machine/imx6qp1gsmarc.conf b/conf/machine/imx6qp1gsmarc.conf
new file mode 100644
index 0000000..6cce855
--- /dev/null
+++ b/conf/machine/imx6qp1gsmarc.conf
@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: Embedian SMARC-FiMX6
+#@SOC: i.MX6Q
+#@DESCRIPTION: Machine configuration for Embedian SMARC-FiMX6 board
+#@MAINTAINER: Eric Lee <eric.lee@embedian.com>
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+SOC_FAMILY = "mx6:mx6q"
+
+# Use u-boot SMARC-FiMX6
+PREFERRED_PROVIDER_virtual/bootloader_imx6q1gsmarc = "u-boot-smarcfimx6"
+PREFERRED_PROVIDER_u-boot_imx6q1gsmarc = "u-boot-smarcfimx6"
+PREFERRED_VERSION_u-boot_imx6q1gsmarc = "2015.04-smarcfimx6"
+UBOOT_MACHINE = "smarcfimx6_quadplus_1g_ser3_defconfig"
+
+# Use linux kernel SMARC-FiMX6
+PREFERRED_PROVIDER_virtual/kernel_imx6q1gsmarc = "linux-smarcfimx6"
+PREFERRED_VERSION_linux-smarcfimx6_imx6q1gsmarc = "4.1.15"
+KERNEL_DEVICETREE = "imx6q-smarcfimx6.dtb imx6dl-smarcfimx6.dtb imx6q-smarcfimx6-xga.dtb imx6dl-smarcfimx6-xga.dtb imx6q-smarcfimx6-wxga.dtb imx6dl-smarcfimx6-wxga.dtb imx6q-smarcfimx6-wvga.dtb imx6dl-smarcfimx6-wvga.dtb imx6q-smarcfimx6-1080p.dtb imx6dl-smarcfimx6-1080p.dtb imx6qp-smarcfimx6.dtb imx6qp-smarcfimx6-xga.dtb imx6qp-smarcfimx6-wxga.dtb imx6qp-smarcfimx6-wvga.dtb imx6qp-smarcfimx6-1080p.dtb"
+
+# Specify Nodejs version if you would like Cloud9 to be build
+# PREFERRED_VERSION_nodejs_imx6q1gsmarc = "0.8.21"
+
+SERIAL_CONSOLE = "115200 ttymxc4"
+
+MACHINE_FEATURES += "screen usbgadget vfat ext2 bluetooth wifi pci alsa serial usbhost"
+MACHINE_FIRMWARE_append_mx6 = " firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d linux-firmware-ath6k"
+
+IMAGE_FSTYPES += "tar.bz2"
+
+# Ship all kernel modules by default
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules udev-rules-imx ${MACHINE_FIRMWARE}"
diff --git a/conf/machine/imx6qp2gsmarc.conf b/conf/machine/imx6qp2gsmarc.conf
new file mode 100644
index 0000000..de6c161
--- /dev/null
+++ b/conf/machine/imx6qp2gsmarc.conf
@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: Embedian SMARC-FiMX6
+#@SOC: i.MX6Q
+#@DESCRIPTION: Machine configuration for Embedian SMARC-FiMX6 board
+#@MAINTAINER: Eric Lee <eric.lee@embedian.com>
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+SOC_FAMILY = "mx6:mx6q"
+
+# Use u-boot SMARC-FiMX6
+PREFERRED_PROVIDER_virtual/bootloader_imx6q2gsmarc = "u-boot-smarcfimx6"
+PREFERRED_PROVIDER_u-boot_imx6q2gsmarc = "u-boot-smarcfimx6"
+PREFERRED_VERSION_u-boot_imx6q2gsmarc = "2015.04-smarcfimx6"
+UBOOT_MACHINE = "smarcfimx6_quadplus_2g_ser3_defconfig"
+
+# Use linux kernel SMARC-FiMX6
+PREFERRED_PROVIDER_virtual/kernel_imx6q2gsmarc = "linux-smarcfimx6"
+PREFERRED_VERSION_linux-smarcfimx6_imx6q2gsmarc = "4.1.15"
+KERNEL_DEVICETREE = "imx6q-smarcfimx6.dtb imx6dl-smarcfimx6.dtb imx6q-smarcfimx6-xga.dtb imx6dl-smarcfimx6-xga.dtb imx6q-smarcfimx6-wxga.dtb imx6dl-smarcfimx6-wxga.dtb imx6q-smarcfimx6-wvga.dtb imx6dl-smarcfimx6-wvga.dtb imx6q-smarcfimx6-1080p.dtb imx6dl-smarcfimx6-1080p.dtb imx6qp-smarcfimx6.dtb imx6qp-smarcfimx6-xga.dtb imx6qp-smarcfimx6-wxga.dtb imx6qp-smarcfimx6-wvga.dtb imx6qp-smarcfimx6-1080p.dtb"
+
+# Specify Nodejs version if you would like Cloud9 to be build
+PREFERRED_VERSION_nodejs_imx6q2gsmarc = "0.8.21"
+
+SERIAL_CONSOLE = "115200 ttymxc4"
+
+MACHINE_FEATURES += "screen usbgadget vfat ext2 bluetooth wifi pci alsa serial usbhost"
+MACHINE_FIRMWARE_append_mx6 = " firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d linux-firmware-ath6k"
+
+IMAGE_FSTYPES += "tar.bz2"
+
+# Ship all kernel modules by default
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
diff --git a/recipes-bsp/u-boot/u-boot-smarcfimx6_2015.04-smarcfimx6.bb b/recipes-bsp/u-boot/u-boot-smarcfimx6_2015.04-smarcfimx6.bb
index 10bcbfd..dc8383f 100644
--- a/recipes-bsp/u-boot/u-boot-smarcfimx6_2015.04-smarcfimx6.bb
+++ b/recipes-bsp/u-boot/u-boot-smarcfimx6_2015.04-smarcfimx6.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a
 
 PV = "2015.04-smarcfimx6"
 
-SRCREV = "a25b51e56197d3d2e7a870bf8827a46192070f5f"
+SRCREV = "83e43e196e89d3eeb0bec5053b0b582bfb916bd3"
 SRCBRANCH = "smarc-imx_v2015.04_4.1.15_1.0.0_ga"
 SRC_URI = "${EMB_UBOOT_MIRROR};protocol=ssh;branch=${SRCBRANCH}"
 
diff --git a/recipes-kernel/linux/linux-smarcfimx6_4.1.15.bb b/recipes-kernel/linux/linux-smarcfimx6_4.1.15.bb
index 91bdf50..32e582a 100644
--- a/recipes-kernel/linux/linux-smarcfimx6_4.1.15.bb
+++ b/recipes-kernel/linux/linux-smarcfimx6_4.1.15.bb
@@ -17,7 +17,7 @@ SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH} \
         file://defconfig \
 "
 
-SRCREV = "59536c79b37195e96db08facfe01afe4b46545c0"
+SRCREV = "539fdd2c7c4d615b7fcb19fed20c9ae7f6d51a41"
 PV = "4.1.15"
 LOCALVERSION = "-1.0.1_smarc"