diff --git a/meta-fsp2/conf/machine/include/fsp2.inc b/meta-fsp2/conf/machine/include/fsp2.inc
index a053d37..3672aeb 100644
--- a/meta-fsp2/conf/machine/include/fsp2.inc
+++ b/meta-fsp2/conf/machine/include/fsp2.inc
@@ -3,6 +3,7 @@
 #@DESCRIPTION: evaluation machine board configuration for the fsp2 ppc476
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-fsp2"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-fsp2"
 
 DEFAULTTUNE = "powerpc-nf"
 
diff --git a/meta-fsp2/conf/machine/sunray2.conf b/meta-fsp2/conf/machine/sunray2.conf
index e61487f..dd21344 100644
--- a/meta-fsp2/conf/machine/sunray2.conf
+++ b/meta-fsp2/conf/machine/sunray2.conf
@@ -4,8 +4,7 @@
 
 require conf/machine/include/fsp2.inc
 
-#dummy uboot settings
-UBOOT_MACHINE_sunray2 = "mpc8308_p1m_defconfig"
-UBOOT_ENTRYPOINT = "0x0"
-UBOOT_LOADADDRESS = "0x0"
+UBOOT_MACHINE_sunray2 = "fsp2_defconfig"
+UBOOT_ENTRYPOINT = "0x10000000"
+UBOOT_LOADADDRESS = "0x10000000"
 
diff --git a/meta-fsp2/recipes-bsp/u-boot/u-boot-fsp2_git.bb b/meta-fsp2/recipes-bsp/u-boot/u-boot-fsp2_git.bb
new file mode 100644
index 0000000..941f8b4
--- /dev/null
+++ b/meta-fsp2/recipes-bsp/u-boot/u-boot-fsp2_git.bb
@@ -0,0 +1,9 @@
+require recipes-bsp/u-boot/u-boot.inc
+
+SRC_URI = "git://github.com/openbmc/u-boot;branch=v2017.11-fsp2-openbmc"
+SRCREV = "d675f0a16ecc876b1aa78b4151af89c80fe0f4b9"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+S = "${WORKDIR}/git"
+
+PROVIDES += "u-boot"
diff --git a/meta-z/conf/machine/ibm-z.conf b/meta-z/conf/machine/ibm-z.conf
index 90765bd..47bfb07 100644
--- a/meta-z/conf/machine/ibm-z.conf
+++ b/meta-z/conf/machine/ibm-z.conf
@@ -6,8 +6,6 @@
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/ibm.inc
 
-#dummy uboot settings
-UBOOT_MACHINE_sunray2 = "mpc8308_p1m_defconfig"
-UBOOT_ENTRYPOINT = "0x0"
-UBOOT_LOADADDRESS = "0x0"
-
+UBOOT_MACHINE_sunray2 = "fsp2_defconfig"
+UBOOT_ENTRYPOINT = "0x10000000"
+UBOOT_LOADADDRESS = "0x10000000"