summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2013-03-18 18:25:52 -0400
committerDenys Dmytriyenko <denys@ti.com>2013-03-18 21:31:33 -0400
commit948b5f11d352a4824653229e48fb8c346d38169b (patch)
treeba707c0f8a3d8b5e5090b0e1455ccab8e71db783 /conf
parent10c6e2943068003a5425763c4ad98d5c6b383dcb (diff)
downloadmeta-ti-948b5f11d352a4824653229e48fb8c346d38169b.tar.gz
am180x: switch default u-boot preference to machine-specific tree
SDKs or other users of meta-ti can still use one of the other recipes for stability or featureset, by setting PREFERRED_PROVIDER in their config. Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/am180x-evm.conf2
-rw-r--r--conf/machine/include/davinci.inc2
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/machine/am180x-evm.conf b/conf/machine/am180x-evm.conf
index 7ea25cf1..cff15656 100644
--- a/conf/machine/am180x-evm.conf
+++ b/conf/machine/am180x-evm.conf
@@ -14,3 +14,5 @@ IMAGE_FSTYPES += "tar.gz ubi"
14SERIAL_CONSOLE = "115200 ttyS2" 14SERIAL_CONSOLE = "115200 ttyS2"
15 15
16PREFERRED_PROVIDER_virtual/kernel = "linux-omapl138-psp" 16PREFERRED_PROVIDER_virtual/kernel = "linux-omapl138-psp"
17PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am180x"
18PREFERRED_PROVIDER_u-boot = "u-boot-am180x"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 756a1e58..6be5eb71 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
1require conf/machine/include/tune-arm926ejs.inc 1require conf/machine/include/tune-arm926ejs.inc
2 2
3# Increase this everytime you change something in the kernel 3# Increase this everytime you change something in the kernel
4MACHINE_KERNEL_PR = "r52" 4MACHINE_KERNEL_PR = "r53"
5 5
6KERNEL_IMAGETYPE = "uImage" 6KERNEL_IMAGETYPE = "uImage"
7 7