summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2016-04-20 03:47:32 +0000
committerDenys Dmytriyenko <denys@ti.com>2016-04-19 18:05:33 -0400
commit4b74d640a29bfc05a471d72d1e371385a5f8e16f (patch)
treef1787897fd5117f1e2799d7c8fbf876cbba9c135 /conf
parent1061600edebabbe146562a13ba7b744078988cc4 (diff)
downloadmeta-ti-4b74d640a29bfc05a471d72d1e371385a5f8e16f.tar.gz
conf: update old machines to use linux-ti-staging and u-boot-ti-staging
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/davinci.inc9
-rw-r--r--conf/machine/include/omap3.inc9
-rw-r--r--conf/machine/include/omap4.inc3
3 files changed, 12 insertions, 9 deletions
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 9f90f24b..59e423d7 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,12 +1,13 @@
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 = "r53" 4MACHINE_KERNEL_PR = "r54"
5 5
6KERNEL_IMAGETYPE = "uImage" 6KERNEL_IMAGETYPE = "zImage"
7 7
8PREFERRED_PROVIDER_virtual/kernel = "linux-mainline" 8PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
9PREFERRED_PROVIDER_virtual/bootloader = "u-boot" 9PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
10PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
10 11
11UBOOT_MACHINE = "davinci_dvevm_config" 12UBOOT_MACHINE = "davinci_dvevm_config"
12 13
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index f83bfa22..3a841409 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -17,13 +17,14 @@ XSERVER = "xserver-xorg \
17MACHINE_GUI_CLASS = "bigscreen" 17MACHINE_GUI_CLASS = "bigscreen"
18 18
19# Increase this everytime you change something in the kernel 19# Increase this everytime you change something in the kernel
20MACHINE_KERNEL_PR = "r126" 20MACHINE_KERNEL_PR = "r127"
21 21
22KERNEL_IMAGETYPE = "uImage" 22KERNEL_IMAGETYPE = "zImage"
23 23
24# Default providers, may need to override for specific machines 24# Default providers, may need to override for specific machines
25PREFERRED_PROVIDER_virtual/kernel = "linux-mainline" 25PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
26PREFERRED_PROVIDER_virtual/bootloader = "u-boot" 26PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
27PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
27 28
28UBOOT_ARCH = "arm" 29UBOOT_ARCH = "arm"
29UBOOT_MACHINE = "omap3_evm_config" 30UBOOT_MACHINE = "omap3_evm_config"
diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
index 1657326e..deb33169 100644
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -6,6 +6,7 @@ require conf/machine/include/tune-cortexa9.inc
6 6
7PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" 7PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
8PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" 8PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
9PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
9 10
10PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" 11PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
11XSERVER = "xserver-xorg \ 12XSERVER = "xserver-xorg \
@@ -14,7 +15,7 @@ XSERVER = "xserver-xorg \
14 xf86-video-omap" 15 xf86-video-omap"
15 16
16# Increase this everytime you change something in the kernel 17# Increase this everytime you change something in the kernel
17MACHINE_KERNEL_PR = "r3" 18MACHINE_KERNEL_PR = "r4"
18 19
19KERNEL_IMAGETYPE = "zImage" 20KERNEL_IMAGETYPE = "zImage"
20 21