summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorChase Maupin <Chase.Maupin@ti.com>2013-10-22 16:12:02 -0500
committerDenys Dmytriyenko <denys@ti.com>2013-10-22 16:26:27 -0400
commitfe3eb57f580b945e63779114245e148a1bb6e4cb (patch)
treeb0cda57c919aeb4bdd464e8349cede4cf0a008dd /conf
parentc11504664990f007c3903d349e7cc135a904f8e2 (diff)
downloadmeta-ti-fe3eb57f580b945e63779114245e148a1bb6e4cb.tar.gz
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>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/dra7xx-evm.conf3
-rw-r--r--conf/machine/include/omap-a15.inc2
2 files changed, 1 insertions, 4 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"
8 8
9SERIAL_CONSOLE = "115200 ttyO0" 9SERIAL_CONSOLE = "115200 ttyO0"
10 10
11PREFERRED_PROVIDER_virtual/bootloader = "u-boot-dra7xx"
12PREFERRED_PROVIDER_u-boot = "u-boot-dra7xx"
13
14UBOOT_MACHINE = "dra7xx_evm_config" 11UBOOT_MACHINE = "dra7xx_evm_config"
15 12
16# UBI information. Note that this is board and kernel specific. Changes 13# 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
4require conf/machine/include/tune-cortexa15.inc 4require conf/machine/include/tune-cortexa15.inc
5 5
6# Increase this everytime you change something in the kernel 6# Increase this everytime you change something in the kernel
7MACHINE_KERNEL_PR = "r1" 7MACHINE_KERNEL_PR = "r2"
8 8
9PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" 9PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
10PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" 10PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"