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"
 KERNEL_IMAGETYPE = "zImage"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
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"
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r0"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
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"
 DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa15.inc
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
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
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r7"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
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"
 KERNEL_IMAGETYPE = "zImage"
 # Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
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"
 DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa9.inc
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
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"
 MACHINE_KERNEL_PR = "r22"
 # Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
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"
 MACHINE_KERNEL_PR = "r3"
 # Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
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
 require conf/machine/include/omapl137.inc
 # HACK: The omapl137 family does not have linux kernel support.
-PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy"
 EXTRA_IMAGEDEPENDS = ""
 IMAGE_FSTYPES = "tar.xz"

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
6	KERNEL_IMAGETYPE = "zImage"	6	KERNEL_IMAGETYPE = "zImage"
7		7
8	PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"	8	PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
9	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"	9	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
10	PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"	10	PREFERRED_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
11	MACHINE_KERNEL_PR = "r0"	11	MACHINE_KERNEL_PR = "r0"
12		12
13	PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"	13	PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
14	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"	14	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
15	PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"	15	PREFERRED_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"
4	DEFAULTTUNE ?= "armv7athf-neon"	4	DEFAULTTUNE ?= "armv7athf-neon"
5	require conf/machine/include/tune-cortexa15.inc	5	require conf/machine/include/tune-cortexa15.inc
6		6
7	PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"	7	PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
8	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"	8	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
9	PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"	9	PREFERRED_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
8	MACHINE_KERNEL_PR = "r7"	8	MACHINE_KERNEL_PR = "r7"
9		9
10	PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"	10	PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
11	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"	11	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
12	PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"	12	PREFERRED_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"
22	KERNEL_IMAGETYPE = "zImage"	22	KERNEL_IMAGETYPE = "zImage"
23		23
24	# Default providers, may need to override for specific machines	24	# Default providers, may need to override for specific machines
25	PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"	25	PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
26	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"	26	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
27	PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"	27	PREFERRED_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"
4	DEFAULTTUNE ?= "armv7athf-neon"	4	DEFAULTTUNE ?= "armv7athf-neon"
5	require conf/machine/include/tune-cortexa9.inc	5	require conf/machine/include/tune-cortexa9.inc
6		6
7	PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"	7	PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
8	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"	8	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
9	PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"	9	PREFERRED_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"
20	MACHINE_KERNEL_PR = "r22"	20	MACHINE_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
23	PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"	23	PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
24	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"	24	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
25	PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"	25	PREFERRED_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"
20	MACHINE_KERNEL_PR = "r3"	20	MACHINE_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
23	PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"	23	PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
24	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"	24	PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
25	PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"	25	PREFERRED_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
6	require conf/machine/include/omapl137.inc	6	require 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.
9	PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"	9	PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy"
10	EXTRA_IMAGEDEPENDS = ""	10	EXTRA_IMAGEDEPENDS = ""
11		11
12	IMAGE_FSTYPES = "tar.xz"	12	IMAGE_FSTYPES = "tar.xz"