diff --git a/conf/machine/am335x-hw25.conf b/conf/machine/am335x-hw25.conf
index 7152ee3..008eb76 100644
--- a/conf/machine/am335x-hw25.conf
+++ b/conf/machine/am335x-hw25.conf
@@ -5,7 +5,7 @@
 require am335x-nmhw24.conf
 MACHINEOVERRIDES .= ":am335x-nmhw24"
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-hw25"
+UBOOT_MACHINE = "am335x_hw25_defconfig"
 
 KERNEL_DEVICETREE = "am335x-hw25.dtb "
 
diff --git a/conf/machine/am335x-nmhw21.conf b/conf/machine/am335x-nmhw21.conf
index d49fae7..43c0078 100644
--- a/conf/machine/am335x-nmhw21.conf
+++ b/conf/machine/am335x-nmhw21.conf
@@ -12,7 +12,8 @@ KERNEL_DEVICETREE = "am335x-nmhw21-prod1.dtb \
 
 KERNEL_IMAGETYPE = "zImage"
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nmhw21"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti33x"
+UBOOT_MACHINE = "am335x_nmhw21_defconfig"
 
 USE_VT = "0"
 
diff --git a/conf/machine/am335x-nmhw24.conf b/conf/machine/am335x-nmhw24.conf
index 5a087b4..6f894e7 100644
--- a/conf/machine/am335x-nmhw24.conf
+++ b/conf/machine/am335x-nmhw24.conf
@@ -12,7 +12,8 @@ KERNEL_DEVICETREE = "am335x-nmhw24-prod1.dtb \
 
 KERNEL_IMAGETYPE = "zImage"
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nmhw24"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti33x"
+UBOOT_MACHINE = "am335x_nrhw24_defconfig"
 
 USE_VT = "0"
 
diff --git a/conf/machine/am335x-nrhw16.conf b/conf/machine/am335x-nrhw16.conf
index 14bb5d0..f03c750 100644
--- a/conf/machine/am335x-nrhw16.conf
+++ b/conf/machine/am335x-nrhw16.conf
@@ -15,7 +15,8 @@ KERNEL_DEVICETREE = "am335x-nrhw16.dtb \
     "
 KERNEL_IMAGETYPE = "zImage"
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw16-v2"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti33x"
+UBOOT_MACHINE = "am335x_nbhw16_v2_defconfig"
 
 USE_VT = "0"
 
diff --git a/conf/machine/am335x-nrhw20.conf b/conf/machine/am335x-nrhw20.conf
index 6013168..1d0fb68 100644
--- a/conf/machine/am335x-nrhw20.conf
+++ b/conf/machine/am335x-nrhw20.conf
@@ -11,7 +11,8 @@ KERNEL_DEVICETREE = "am335x-nrhw20-prod1.dtb \
     "
 KERNEL_IMAGETYPE = "zImage"
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw20-v1"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti33x"
+UBOOT_MACHINE = "am335x_nrhw20_defconfig"
 
 USE_VT = "0"
 
diff --git a/conf/machine/armada-385-nrhw18.conf b/conf/machine/armada-385-nrhw18.conf
index ed744b6..6aeabc8 100644
--- a/conf/machine/armada-385-nrhw18.conf
+++ b/conf/machine/armada-385-nrhw18.conf
@@ -14,7 +14,8 @@ KERNEL_IMAGETYPE = "zImage"
 KERNEL_MODULE_PROBECONF += "ath10k_pci"
 module_conf_ath10k_pci = "options ath10k_pci irq_mode=1"
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada-385-nrhw18-v2"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada"
+UBOOT_MACHINE = "armada-385-nrhw18-v2_defconfig"
 IMAGE_BOOT_FILES = "u-boot-armada-385-nrhw18-v2.kwb"
 
 DEFAULT_ETH = "eth2"
diff --git a/recipes-bsp/u-boot/u-boot-am335x-hw25_git.bb b/recipes-bsp/u-boot/u-boot-am335x-hw25_git.bb
deleted file mode 100644
index 05aca2e..0000000
--- a/recipes-bsp/u-boot/u-boot-am335x-hw25_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require u-boot-am335x-nmhw24_git.bb
-
-UBOOT_MACHINE = "am335x_hw25_defconfig"
-
-
diff --git a/recipes-bsp/u-boot/u-boot-am335x-nmhw21_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nmhw21_git.bb
deleted file mode 100644
index 9762769..0000000
--- a/recipes-bsp/u-boot/u-boot-am335x-nmhw21_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-require u-boot-nm.inc
-
-# Force machine configuration for this recipe
-UBOOT_MACHINE = "am335x_nmhw21_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 ?= "${AUTOREV}"
-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}
-}
-
-# nmhw21 and hw26 using same u-boot sources so let's create symlinks for hw26 when building nmhw21
-PN_E = "u-boot-${MACHINE}"
-do_deploy_append_am335x-hw26() {
-    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN_E}.xmodem.bin
-    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN_E}.xmodem.bin
-    cp ${S}/u-boot.img ${DEPLOYDIR}/${PN_E}.${UBOOT_SUFFIX}
-    cp ${S}/MLO ${DEPLOYDIR}/spl-${PN_E}.${UBOOT_SUFFIX}
-}
diff --git a/recipes-bsp/u-boot/u-boot-am335x-nmhw24_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nmhw24_git.bb
deleted file mode 100644
index 7dae2ad..0000000
--- a/recipes-bsp/u-boot/u-boot-am335x-nmhw24_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require u-boot-nm.inc
-
-# Force machine configuration for this recipe
-UBOOT_MACHINE = "am335x_nrhw24_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 ?= "${AUTOREV}"
-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
deleted file mode 100644
index e9f83ef..0000000
--- a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require u-boot-am335x-nrhw16-common.inc
-
-# Force machine configuration for this recipe
-UBOOT_MACHINE = "am335x_nbhw16_defconfig"
-
-# Should be updated when a new U-Boot Version is available
-SRCREV ?= "a6f157c6dbd048b452c7e2640215c55be658780c"
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
deleted file mode 100644
index 1d51e20..0000000
--- a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require u-boot-am335x-nrhw16-common.inc
-
-# Force machine configuration for this recipe
-UBOOT_MACHINE = "am335x_nbhw16_v2_defconfig"
-
-SRCREV ?= "${AUTOREV}"
-
diff --git a/recipes-bsp/u-boot/u-boot-am335x-nrhw20-v1_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nrhw20-v1_git.bb
deleted file mode 100644
index f02a039..0000000
--- a/recipes-bsp/u-boot/u-boot-am335x-nrhw20-v1_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require u-boot-nm.inc
-
-# Force machine configuration for this recipe
-UBOOT_MACHINE = "am335x_nrhw20_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 ?= "${AUTOREV}"
-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-armada-385-nrhw18-v2_git.bb b/recipes-bsp/u-boot/u-boot-armada_git.bb
similarity index 88%
rename from recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb
rename to recipes-bsp/u-boot/u-boot-armada_git.bb
index 36c9009..492a76d 100644
--- a/recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb
+++ b/recipes-bsp/u-boot/u-boot-armada_git.bb
@@ -1,8 +1,5 @@
 require u-boot-nm.inc
 
-# Force machine configuration for this recipe
-UBOOT_MACHINE = "armada-385-nrhw18-v2_defconfig"
-
 # Be aware github/netmodule git
 SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2017.11-armada-nrhw"
 
diff --git a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-common.inc b/recipes-bsp/u-boot/u-boot-ti33x_git.bb
similarity index 96%
rename from recipes-bsp/u-boot/u-boot-am335x-nrhw16-common.inc
rename to recipes-bsp/u-boot/u-boot-ti33x_git.bb
index 556e2aa..8b17003 100644
--- a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-common.inc
+++ b/recipes-bsp/u-boot/u-boot-ti33x_git.bb
@@ -1,10 +1,10 @@
 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
+SRCREV ?= "${AUTOREV}"
 PV = "v2016.05+git${SRCPV}"
 
 SPL_BINARY = "MLO"
@@ -18,4 +18,3 @@ do_deploy_append() {
     cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
     cp ${S}/MLO ${DEPLOYDIR}/spl-${PN}.${UBOOT_SUFFIX}
 }
-