diff --git a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-common.inc b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-common.inc
new file mode 100644
index 0000000..556e2aa
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-common.inc
@@ -0,0 +1,21 @@
+require u-boot-nm.inc
+
+
+# Be aware github/netmodule git
+SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2016.05-am335x-netmodule"
+
+# Should be updated when a new U-Boot Version is available
+PV = "v2016.05+git${SRCPV}"
+
+SPL_BINARY = "MLO"
+UBOOT_SUFFIX = "img"
+
+do_deploy_append() {
+    rm -f ${DEPLOYDIR}/*${PN}.xmodem.bin
+    rm -f ${DEPLOYDIR}/*${PN}.${UBOOT_SUFFIX}
+    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
+    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
+    cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
+    cp ${S}/MLO ${DEPLOYDIR}/spl-${PN}.${UBOOT_SUFFIX}
+}
+
diff --git a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb
index b176fa9..e9f83ef 100644
--- a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb
+++ b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb
@@ -1,24 +1,7 @@
-require u-boot-nm.inc
+require u-boot-am335x-nrhw16-common.inc
 
 # Force machine configuration for this recipe
 UBOOT_MACHINE = "am335x_nbhw16_defconfig"
 
-# Be aware github/netmodule git
-SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2016.05-am335x-netmodule"
-
 # Should be updated when a new U-Boot Version is available
 SRCREV ?= "a6f157c6dbd048b452c7e2640215c55be658780c"
-PV = "v2016.05+git${SRCPV}"
-
-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-
-do_deploy_append() {
-    rm -f ${DEPLOYDIR}/*${PN}.xmodem.bin
-    rm -f ${DEPLOYDIR}/*${PN}.${UBOOT_SUFFIX}
-    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
-    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
-    cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
-    cp ${S}/MLO ${DEPLOYDIR}/spl-${PN}.${UBOOT_SUFFIX}
-}
-
diff --git a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb
index 4e5d91e..1d51e20 100644
--- a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb
+++ b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb
@@ -1,4 +1,4 @@
-require u-boot-am335x-nrhw16-v1_git.bb
+require u-boot-am335x-nrhw16-common.inc
 
 # Force machine configuration for this recipe
 UBOOT_MACHINE = "am335x_nbhw16_v2_defconfig"