From 7241b9d0c20745a317d2fc6e5a0e22c12f256bd9 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Tue, 24 Jun 2014 04:23:52 +0000
Subject: [PATCH] conf/machine: update legacy machines to use latest mainline
 kernel and u-boot

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 conf/machine/am180x-evm.conf     | 4 ----
 conf/machine/am3517-evm.conf     | 5 -----
 conf/machine/am37x-evm.conf      | 4 ----
 conf/machine/beagleboard.conf    | 4 ----
 conf/machine/include/davinci.inc | 2 +-
 conf/machine/include/omap3.inc   | 2 +-
 conf/machine/omap3evm.conf       | 2 --
 7 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/conf/machine/am180x-evm.conf b/conf/machine/am180x-evm.conf
index 44ca0c61..3182e8a0 100644
--- a/conf/machine/am180x-evm.conf
+++ b/conf/machine/am180x-evm.conf
@@ -12,7 +12,3 @@ UBOOT_LOADADDRESS = "0xc0008000"
 IMAGE_FSTYPES += "tar.gz"
 
 SERIAL_CONSOLE = "115200 ttyS2"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-omapl138-psp"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am180x"
-PREFERRED_PROVIDER_u-boot = "u-boot-am180x"
diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf
index b9b6d17b..7295c1ff 100644
--- a/conf/machine/am3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -15,11 +15,6 @@ EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 SERIAL_CONSOLE = "115200 ttyO2"
 USE_VT = "2"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
-
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am3517"
-PREFERRED_PROVIDER_u-boot = "u-boot-am3517"
-
 UBOOT_MACHINE = "am3517_evm_config"
 XLOAD_MACHINE = "am3517evm_config"
 
diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf
index 0d53d508..16ce73c8 100644
--- a/conf/machine/am37x-evm.conf
+++ b/conf/machine/am37x-evm.conf
@@ -14,10 +14,6 @@ EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
 SERIAL_CONSOLE = "115200 ttyO0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am37x"
-PREFERRED_PROVIDER_u-boot = "u-boot-am37x"
-
 # NOTE: there are NAND and OneNAND versions of this board...
 # do ubiattach /dev/ubi_ctrl -m 4
 # From dmesg:
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index f9231199..32985b39 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -7,10 +7,6 @@ require conf/machine/include/omap3.inc
 # Only has DVI connector for external screen
 GUI_MACHINE_CLASS = "bigscreen"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-beagleboard"
-PREFERRED_PROVIDER_u-boot = "u-boot-beagleboard"
-
 IMAGE_FSTYPES += "tar.gz ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp"
 
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 6be5eb71..9f90f24b 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -5,7 +5,7 @@ MACHINE_KERNEL_PR = "r53"
 
 KERNEL_IMAGETYPE = "uImage"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 
 UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index e71630b0..0757b43e 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -22,7 +22,7 @@ MACHINE_KERNEL_PR = "r126"
 KERNEL_IMAGETYPE = "uImage"
 
 # Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
+PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 
 UBOOT_ARCH = "arm"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 584866cb..6bfd8088 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -15,8 +15,6 @@ EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 SERIAL_CONSOLE = "115200 ttyS0"
 USE_VT = "0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
-
 EXTRA_IMAGEDEPENDS += "x-load"
 
 # NOTE: there are NAND and OneNAND versions of this board...