From: David Nyström <david.nystrom@enea.com>
Date: Thu, 31 May 2012 08:13:20 +0000 (+0200)
Subject: Added ?= to PREFERRED provider in machines, and corrected linux PREFERRED_VERSION
X-Git-Tag: 2.1~534^2~454
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9eca8c615465b3891b93e9f401bf999456a1dd6d;p=meta-freescale.git

Added ?= to PREFERRED provider in machines, and corrected linux PREFERRED_VERSION

Signed-off-by: Matthew McClintock <msm@freescale.com>
---

diff --git a/meta-fsl-ppc/conf/machine/e500mc.inc b/meta-fsl-ppc/conf/machine/e500mc.inc
index a8eb16b3..479c513b 100644
--- a/meta-fsl-ppc/conf/machine/e500mc.inc
+++ b/meta-fsl-ppc/conf/machine/e500mc.inc
@@ -5,12 +5,11 @@ require conf/machine/include/tune-ppce500mc.inc
 MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
 MACHINE_FEATURES_RRECOMMENDS = ""
 
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
+PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-qoriq-sdk"
-PREFERRED_VERSION_virtual/kernel = "3.0.1"
-PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers"
-
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
 #		ext2.bz2 ext2.lzma \
 #		ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/meta-fsl-ppc/conf/machine/e500v2.inc b/meta-fsl-ppc/conf/machine/e500v2.inc
index d529b3f9..6e2eb493 100644
--- a/meta-fsl-ppc/conf/machine/e500v2.inc
+++ b/meta-fsl-ppc/conf/machine/e500v2.inc
@@ -5,11 +5,11 @@ require conf/machine/include/tune-ppce500v2.inc
 MACHINE_FEATURES = "kernel26 pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = ""
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-qoriq-sdk"
-PREFERRED_VERSION_virtual/kernel = "3.0.1"
-PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
+PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
 
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
 #		ext2.bz2 ext2.lzma \
 #		ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/meta-fsl-ppc/conf/machine/e5500-64b.inc b/meta-fsl-ppc/conf/machine/e5500-64b.inc
index 4e460531..1e5d92b6 100644
--- a/meta-fsl-ppc/conf/machine/e5500-64b.inc
+++ b/meta-fsl-ppc/conf/machine/e5500-64b.inc
@@ -6,12 +6,11 @@ require conf/machine/include/tune-ppce5500.inc
 MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
 MACHINE_FEATURES_RRECOMMENDS = ""
 
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
+PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-qoriq-sdk"
-PREFERRED_VERSION_virtual/kernel = "3.0.1"
-PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers"
-
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
 #		ext2.bz2 ext2.lzma \
 #		ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/meta-fsl-ppc/conf/machine/e5500.inc b/meta-fsl-ppc/conf/machine/e5500.inc
index 4ec51ce0..f34c2c0c 100644
--- a/meta-fsl-ppc/conf/machine/e5500.inc
+++ b/meta-fsl-ppc/conf/machine/e5500.inc
@@ -5,12 +5,11 @@ require conf/machine/include/tune-ppce5500.inc
 MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
 MACHINE_FEATURES_RRECOMMENDS = ""
 
-
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_virtual/kernel ?= "3.0.1"
+PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
 
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
 #		ext2.bz2 ext2.lzma \
 #		ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf
index c12dc0aa..8a50bec9 100644
--- a/meta-fsl-ppc/conf/machine/p1022ds.conf
+++ b/meta-fsl-ppc/conf/machine/p1022ds.conf
@@ -8,7 +8,7 @@ UBOOT_MACHINES = "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_3
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1022ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg-lite"
 
 XSERVER = " \
 	xserver-xorg-lite \