diff --git a/conf/machine/jetson-tx1.conf b/conf/machine/jetson-tx1.conf
index f8adafc5..90bf0398 100644
--- a/conf/machine/jetson-tx1.conf
+++ b/conf/machine/jetson-tx1.conf
@@ -10,14 +10,17 @@ MULTILIBS = "multilib:lib32"
 DEFAULTTUNE_virtclass-multilib-lib32 = "armv7ahf-neon-vfpv4"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-tegra"
-PREFERRED_PROVIDER_uboot ?= "u-boot-tegra"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-tegra"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-tegra"
 
 KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE = "tegra210-jetson-tx1-p2597-2180-a01-devkit.dts"
+KERNEL_DEVICETREE = "tegra210-jetson-tx1-p2597-2180-a01-devkit.dtb"
 
 MACHINE_FEATURES = "alsa bluetooth ext2 ext3 vfat usbhost pci wifi rtc"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-devicetree"
 
+UBOOT_MACHINE = "p2371-2180_defconfig"
+
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
 
 GCCVERSION = "4.9%"
diff --git a/recipes-bsp/u-boot/u-boot-tegra_2015.07.bb b/recipes-bsp/u-boot/u-boot-tegra_2015.07.bb
new file mode 100644
index 00000000..be88784a
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-tegra_2015.07.bb
@@ -0,0 +1,11 @@
+require recipes-bsp/u-boot/u-boot.inc
+
+DESCRIPTION = "U-Boot for Nvidia Tegra platforms, based on Nvidia sources"
+COMPATIBLE_MACHINE = "(jetson.*)"
+
+PROVIDES += "u-boot"
+
+SRCBRANCH ?= "l4t/l4t-r23.1"
+SRC_URI = "git://nv-tegra.nvidia.com/3rdparty/u-boot.git;branch=${SRCBRANCH}"
+SRCREV = "2ac3917df428c7ab636f158c20c538e138abb45d"
+PV .= "+git${SRCPV}"
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-tegra_3.10.bb b/recipes-kernel/linux/linux-tegra_3.10.bb
index b8f5739d..6515b1cb 100644
--- a/recipes-kernel/linux/linux-tegra_3.10.bb
+++ b/recipes-kernel/linux/linux-tegra_3.10.bb
@@ -8,6 +8,15 @@ inherit kernel
 
 require recipes-kernel/linux/linux-dtb.inc
 
+PV .= "+git${SRCPV}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1]}:"
+DEPENDS_append_aarch64 = " lib32-gcc-cross-arm lib32-gcc-runtime lib32-binutils-cross-arm"
+CROSS32TC = ""
+CROSS32TC_aarch64 = "${TUNE_ARCH_32}${TARGET_VENDOR}-${TARGET_OS}-gnu${ABIEXTENSION_32}"
+PATH_prepend_aarch64 = "${STAGING_BINDIR_NATIVE}/${CROSS32TC}:"
+EXTRA_OEMAKE_append_aarch64 = ' CROSS32CC="${CROSS32TC}-gcc -march=armv7-a -mfloat-abi=hard" CROSS32LD="${CROSS32TC}-ld.bfd"'
+EXTRA_OEMAKE += 'LIBGCC=""'
+
 L4T_VERSION = "l4t-r23.1"
 LOCALVERSION = "-${L4T_VERSION}"
 
@@ -23,8 +32,4 @@ do_configure_prepend() {
     echo "+g${SRCREV}" | cut -c -9 | tee ${S}/.scmversion > ${B}/.scmversion
 }
 
-do_compile_prepend() {
-    export CROSS32CC="tbd"
-    export CROSS32LD="tbd"
-}
 COMPATIBLE_MACHINE = "(jetson-tx1)"