dra7xx-evm: remove u-boot preferred provider

* Now the DRA7xx support is fully merged into upstream u-boot
  then we can remove setting the PREFERRED_PROVIDER for
  u-boot and virtual/bootloader to u-boot-dra7xx and instead
  pick up the default setting from the omap-a15.inc file.

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

3 files changed, 1 insertions, 20 deletions

diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf
index 5897a5fe..14253cf3 100644
--- a/conf/machine/dra7xx-evm.conf
+++ b/conf/machine/dra7xx-evm.conf
@@ -8,9 +8,6 @@ IMAGE_FSTYPES += "ubi tar.gz"
 
 SERIAL_CONSOLE = "115200 ttyO0"
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-dra7xx"
-PREFERRED_PROVIDER_u-boot = "u-boot-dra7xx"
-
 UBOOT_MACHINE = "dra7xx_evm_config"
 
 # UBI information.  Note that this is board and kernel specific.  Changes
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
index aba122a9..308b2e40 100644
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -4,7 +4,7 @@ require conf/machine/include/soc-family.inc
 require conf/machine/include/tune-cortexa15.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r1"
+MACHINE_KERNEL_PR = "r2"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
diff --git a/recipes-bsp/u-boot/u-boot-dra7xx_2013.04.bb b/recipes-bsp/u-boot/u-boot-dra7xx_2013.04.bb
deleted file mode 100644
index 7cf1b8fc..00000000
--- a/recipes-bsp/u-boot/u-boot-dra7xx_2013.04.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require u-boot-ti.inc
-
-DESCRIPTION = "u-boot bootloader for TI devices"
-
-COMPATIBLE_MACHINE = "dra7xx-evm"
-
-PR = "r1+gitr${SRCPV}"
-
-SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
-
-BRANCH ?= "ti-u-boot-2013.04+"
-
-# This commit corresponds to ti2013.04.02 release tag
-SRCREV = "ca435c914e069f5b74f05f667e2064784943a0ac"
-
-SPL_BINARY = "MLO"