diff options
author | Denys Dmytriyenko <denys@ti.com> | 2013-03-18 14:34:15 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2013-03-18 19:22:41 -0400 |
commit | 809e2d46f239b67c8d2ec953a52998b3fb7a0f40 (patch) | |
tree | db2c54b308f05a8035d5217d17a8ac2fc787495f /conf | |
parent | d3e7ad317131fbf16bb6922114daee6a41d3ea27 (diff) | |
download | meta-ti-809e2d46f239b67c8d2ec953a52998b3fb7a0f40.tar.gz |
ti33x: switch default preference to ti-staging tree
SDKs or other users of meta-ti can still use one of the older 3.2 recipes for
stability or featureset, by setting PREFERRED_PROVIDER in distro or local config.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Acked-by: Chase Maupin <chase.maupin@ti.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/am335x-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/beaglebone.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/ti33x.inc | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/conf/machine/am335x-evm.conf b/conf/machine/am335x-evm.conf index 91f7e546..21e79a2f 100644 --- a/conf/machine/am335x-evm.conf +++ b/conf/machine/am335x-evm.conf | |||
@@ -13,8 +13,6 @@ IMAGE_FSTYPES += "ubi tar.gz" | |||
13 | 13 | ||
14 | SERIAL_CONSOLE = "115200 ttyO0" | 14 | SERIAL_CONSOLE = "115200 ttyO0" |
15 | 15 | ||
16 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti33x-psp" | ||
17 | |||
18 | # UBI information. Note that this is board and kernel specific. Changes | 16 | # UBI information. Note that this is board and kernel specific. Changes |
19 | # in your kernel port may require changes in these variables. For more | 17 | # in your kernel port may require changes in these variables. For more |
20 | # details about this board please see | 18 | # details about this board please see |
diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf index f4112f58..8a83a1ae 100644 --- a/conf/machine/beaglebone.conf +++ b/conf/machine/beaglebone.conf | |||
@@ -7,8 +7,6 @@ require conf/machine/include/ti33x.inc | |||
7 | # Only has DVI connector for external screen | 7 | # Only has DVI connector for external screen |
8 | GUI_MACHINE_CLASS = "bigscreen" | 8 | GUI_MACHINE_CLASS = "bigscreen" |
9 | 9 | ||
10 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti33x-psp" | ||
11 | |||
12 | IMAGE_FSTYPES += "tar.gz" | 10 | IMAGE_FSTYPES += "tar.gz" |
13 | 11 | ||
14 | SERIAL_CONSOLE = "115200 ttyO0" | 12 | SERIAL_CONSOLE = "115200 ttyO0" |
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index f00c7974..62afe169 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc | |||
@@ -19,7 +19,7 @@ GUI_MACHINE_CLASS = "bigscreen" | |||
19 | MACHINE_KERNEL_PR = "r18" | 19 | MACHINE_KERNEL_PR = "r18" |
20 | 20 | ||
21 | # Default providers, may need to override for specific machines | 21 | # Default providers, may need to override for specific machines |
22 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti33x-psp" | 22 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" |
23 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" | 23 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" |
24 | 24 | ||
25 | KERNEL_IMAGETYPE = "uImage" | 25 | KERNEL_IMAGETYPE = "uImage" |