summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorDaniel D?az <daniel.diaz@linaro.org>2020-05-05 03:09:15 +0000
committerDenys Dmytriyenko <denys@ti.com>2020-05-06 00:55:11 +0000
commitf0371c25b8b210734d86b32d884af10a0279ea71 (patch)
tree8544305cddd15e34d5eb4fae6461efe0c40e3248 /conf/machine
parentb584aeaf3d455665c74b0b7a291f31bcf1bee22e (diff)
downloadmeta-ti-f0371c25b8b210734d86b32d884af10a0279ea71.tar.gz
conf/machine: Use weak assignment for preferred virtual/kernel
A user of the meta-ti layer may choose to use a combination of the machines herein with another kernel, not necessarily the one from the machine definition. Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/include/davinci.inc2
-rw-r--r--conf/machine/include/k3.inc2
-rw-r--r--conf/machine/include/keystone.inc2
-rw-r--r--conf/machine/include/omap-a15.inc2
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--conf/machine/include/omap4.inc2
-rw-r--r--conf/machine/include/ti33x.inc2
-rw-r--r--conf/machine/include/ti43x.inc2
-rw-r--r--conf/machine/omapl137-evm.conf2
9 files changed, 9 insertions, 9 deletions
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 6de64839..62ca6887 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -5,7 +5,7 @@ MACHINE_KERNEL_PR = "r54"
5 5
6KERNEL_IMAGETYPE = "zImage" 6KERNEL_IMAGETYPE = "zImage"
7 7
8PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" 8PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
9PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" 9PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
10PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" 10PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
11 11
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index 0c16d968..765e0ee3 100644
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -10,7 +10,7 @@ BBMULTICONFIG += "k3r5"
10# Increase this everytime you change something in the kernel 10# Increase this everytime you change something in the kernel
11MACHINE_KERNEL_PR = "r0" 11MACHINE_KERNEL_PR = "r0"
12 12
13PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" 13PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
14PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" 14PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
15PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" 15PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
16 16
diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/keystone.inc
index ef33975f..e7ea9758 100644
--- a/conf/machine/include/keystone.inc
+++ b/conf/machine/include/keystone.inc
@@ -4,7 +4,7 @@ SOC_FAMILY_append = ":keystone"
4DEFAULTTUNE ?= "armv7athf-neon" 4DEFAULTTUNE ?= "armv7athf-neon"
5require conf/machine/include/tune-cortexa15.inc 5require conf/machine/include/tune-cortexa15.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" 9PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
10 10
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
index 7600126d..c22e6dd6 100644
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -7,7 +7,7 @@ require conf/machine/include/tune-cortexa15.inc
7# Increase this everytime you change something in the kernel 7# Increase this everytime you change something in the kernel
8MACHINE_KERNEL_PR = "r7" 8MACHINE_KERNEL_PR = "r7"
9 9
10PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" 10PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
11PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" 11PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
12PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" 12PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
13 13
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 489f1f9a..5696c82d 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -22,7 +22,7 @@ MACHINE_KERNEL_PR = "r127"
22KERNEL_IMAGETYPE = "zImage" 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-ti-staging" 25PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
26PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" 26PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
27PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" 27PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
28 28
diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
index d9706066..cbca267c 100644
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -4,7 +4,7 @@ SOC_FAMILY_append = ":omap4"
4DEFAULTTUNE ?= "armv7athf-neon" 4DEFAULTTUNE ?= "armv7athf-neon"
5require conf/machine/include/tune-cortexa9.inc 5require 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" 9PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
10 10
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
index db1df043..bf9b5570 100644
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -20,7 +20,7 @@ MACHINE_GUI_CLASS = "bigscreen"
20MACHINE_KERNEL_PR = "r22" 20MACHINE_KERNEL_PR = "r22"
21 21
22# Default providers, may need to override for specific machines 22# Default providers, may need to override for specific machines
23PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" 23PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
24PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" 24PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
25PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" 25PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
26 26
diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc
index e2aaf38c..5d6ea412 100644
--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -20,7 +20,7 @@ MACHINE_GUI_CLASS = "bigscreen"
20MACHINE_KERNEL_PR = "r3" 20MACHINE_KERNEL_PR = "r3"
21 21
22# Default providers, may need to override for specific machines 22# Default providers, may need to override for specific machines
23PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" 23PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
24PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" 24PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
25PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" 25PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
26 26
diff --git a/conf/machine/omapl137-evm.conf b/conf/machine/omapl137-evm.conf
index a8039f31..207b213a 100644
--- a/conf/machine/omapl137-evm.conf
+++ b/conf/machine/omapl137-evm.conf
@@ -6,7 +6,7 @@ require conf/machine/include/davinci.inc
6require conf/machine/include/omapl137.inc 6require conf/machine/include/omapl137.inc
7 7
8# HACK: The omapl137 family does not have linux kernel support. 8# HACK: The omapl137 family does not have linux kernel support.
9PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" 9PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy"
10EXTRA_IMAGEDEPENDS = "" 10EXTRA_IMAGEDEPENDS = ""
11 11
12IMAGE_FSTYPES = "tar.xz" 12IMAGE_FSTYPES = "tar.xz"