diff --git a/conf/machine/imx7d2gsmarc.conf b/conf/machine/imx7d2gsmarc.conf
new file mode 100644
index 0000000..4417b6b
--- /dev/null
+++ b/conf/machine/imx7d2gsmarc.conf
@@ -0,0 +1,45 @@
+#@TYPE: Machine
+#@NAME: Embedian i.MX7D SMARC-FiMX7 SMARC 2.0 Module
+#@SOC: i.MX7D
+#@DESCRIPTION: Machine configuration for Embedian i.MX7D SMARC-FiMX7-D dual core Computer on Modules
+#@MAINTAINER: Eric Lee <eric.lee@embedian.com>
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa7.inc
+
+MACHINEOVERRIDES =. "mx7:mx7d:"
+
+# Use u-boot SMARC-FiMX7 Dual Core
+PREFERRED_PROVIDER_virtual/bootloader_imx7dsmarc = "u-boot-smarcfimx7"
+PREFERRED_PROVIDER_u-boot_imx7dsmarc = "u-boot-smarcfimx7"
+PREFERRED_VERSION_u-boot_imx7dsmarc = "2017.03-smarcfimx7"
+UBOOT_CONFIG ??= ""
+UBOOT_MACHINE = "smarcfimx7d_2g_ser3_defconfig"
+
+# Use linux kernel SMARC-FiMX7
+PREFERRED_PROVIDER_virtual/kernel_imx7dsmarc = "linux-smarcfimx7"
+PREFERRED_VERSION_linux-smarcfimx7_imx7dsmarc = "4.9.11"
+
+KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \
+                     imx7d-sdb-m4.dtb imx7d-sdb-mipi-dsi.dtb imx7d-sdb-qspi.dtb \
+                     imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \
+                     imx7d-sdb-reva-hdmi-audio.dtb imx7d-sdb-reva-m4.dtb imx7d-sdb-reva-qspi.dtb \
+                     imx7d-sdb-reva-touch.dtb imx7d-sdb-reva-wm8960.dtb \
+		     imx7s-smarcfimx7.dtb imx7d-smarcfimx7.dtb"
+
+IMAGE_M4LOADER = "imx-m4-demos"
+IMAGE_M4 = "imx7d_sabresd_m4_TCM_Pingpang.bin imx7d_sabresd_m4_TCM_helloworld.bin imx7d_sabresd_m4_TCM_mcctty.bin"
+
+SERIAL_CONSOLE = "115200 ttymxc2"
+
+MACHINE_FEATURES += "screen usbgadget vfat ext2 bluetooth wifi pci alsa serial usbhost"
+
+IMAGE_FSTYPES_remove = "sdcard"
+IMAGE_FSTYPES += "tar.bz2"
+
+XSERVER += "mesa-driver-swrast"
+
+# Ship all kernel modules by default
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+
+MACHINE_FIRMWARE_append_mx7 = " linux-firmware-ath10k"
diff --git a/recipes-bsp/u-boot/u-boot-smarcfimx7_2017.03-smarcfimx7.bb b/recipes-bsp/u-boot/u-boot-smarcfimx7_2017.03-smarcfimx7.bb
index cf1c097..bbbf6be 100644
--- a/recipes-bsp/u-boot/u-boot-smarcfimx7_2017.03-smarcfimx7.bb
+++ b/recipes-bsp/u-boot/u-boot-smarcfimx7_2017.03-smarcfimx7.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a
 
 PV = "2017.03-smarcfimx7"
 
-SRCREV = "d8c099ece2f8d25d153a1f0ed962acfa4da18375"
+SRCREV = "f247ac24a7d467bfa78698cd7d9537a5e115386e"
 SRCBRANCH = "smarc-imx7_v2017.03_4.9.11_1.0.0_ga"
 SRC_URI = "${EMB_UBOOT_MIRROR};protocol=ssh;branch=${SRCBRANCH}"