summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Nyström <david.nystrom@enea.com>2012-05-31 10:13:20 +0200
committerMatthew McClintock <msm@freescale.com>2012-05-31 13:38:42 -0500
commit7fc222c927e47657be62131c26ae945206b41326 (patch)
treee5143f73388f6d7f1caccd169c85976de9804e87
parent9f2dcb42cb2868f4f524578f1d25c49f507c91d1 (diff)
downloadmeta-fsl-ppc-7fc222c927e47657be62131c26ae945206b41326.tar.gz
Added ?= to PREFERRED provider in machines, and corrected linux PREFERRED_VERSION
Signed-off-by: Matthew McClintock <msm@freescale.com>
Diffstat
-rw-r--r--conf/machine/e500mc.inc9
-rw-r--r--conf/machine/e500v2.inc8
-rw-r--r--conf/machine/e5500-64b.inc9
-rw-r--r--conf/machine/e5500.inc5
-rw-r--r--conf/machine/p1022ds.conf2
5 files changed, 15 insertions, 18 deletions
diff --git a/conf/machine/e500mc.inc b/conf/machine/e500mc.inc
index a8eb16b..479c513 100644
--- a/conf/machine/e500mc.inc
+++ b/conf/machine/e500mc.inc
@@ -5,12 +5,11 @@ require conf/machine/include/tune-ppce500mc.inc
5MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" 5MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
6MACHINE_FEATURES_RRECOMMENDS = "" 6MACHINE_FEATURES_RRECOMMENDS = ""
7 7
8PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
9PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
10PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
8 11
9PREFERRED_PROVIDER_virtual/kernel = "linux-qoriq-sdk" 12KERNEL_IMAGETYPE ?= "uImage"
10PREFERRED_VERSION_virtual/kernel = "3.0.1"
11PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers"
12
13KERNEL_IMAGETYPE = "uImage"
14# disable the images below for now 13# disable the images below for now
15# ext2.bz2 ext2.lzma \ 14# ext2.bz2 ext2.lzma \
16# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" 15# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/conf/machine/e500v2.inc b/conf/machine/e500v2.inc
index d529b3f..6e2eb49 100644
--- a/conf/machine/e500v2.inc
+++ b/conf/machine/e500v2.inc
@@ -5,11 +5,11 @@ require conf/machine/include/tune-ppce500v2.inc
5MACHINE_FEATURES = "kernel26 pci ext2 ext3 serial" 5MACHINE_FEATURES = "kernel26 pci ext2 ext3 serial"
6MACHINE_EXTRA_RRECOMMENDS = "" 6MACHINE_EXTRA_RRECOMMENDS = ""
7 7
8PREFERRED_PROVIDER_virtual/kernel = "linux-qoriq-sdk" 8PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
9PREFERRED_VERSION_virtual/kernel = "3.0.1" 9PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
10PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers" 10PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
11 11
12KERNEL_IMAGETYPE = "uImage" 12KERNEL_IMAGETYPE ?= "uImage"
13# disable the images below for now 13# disable the images below for now
14# ext2.bz2 ext2.lzma \ 14# ext2.bz2 ext2.lzma \
15# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" 15# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/conf/machine/e5500-64b.inc b/conf/machine/e5500-64b.inc
index 4e46053..1e5d92b 100644
--- a/conf/machine/e5500-64b.inc
+++ b/conf/machine/e5500-64b.inc
@@ -6,12 +6,11 @@ require conf/machine/include/tune-ppce5500.inc
6MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" 6MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
7MACHINE_FEATURES_RRECOMMENDS = "" 7MACHINE_FEATURES_RRECOMMENDS = ""
8 8
9PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
10PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
11PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
9 12
10PREFERRED_PROVIDER_virtual/kernel = "linux-qoriq-sdk" 13KERNEL_IMAGETYPE ?= "uImage"
11PREFERRED_VERSION_virtual/kernel = "3.0.1"
12PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers"
13
14KERNEL_IMAGETYPE = "uImage"
15# disable the images below for now 14# disable the images below for now
16# ext2.bz2 ext2.lzma \ 15# ext2.bz2 ext2.lzma \
17# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" 16# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/conf/machine/e5500.inc b/conf/machine/e5500.inc
index 4ec51ce..f34c2c0 100644
--- a/conf/machine/e5500.inc
+++ b/conf/machine/e5500.inc
@@ -5,12 +5,11 @@ require conf/machine/include/tune-ppce5500.inc
5MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" 5MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
6MACHINE_FEATURES_RRECOMMENDS = "" 6MACHINE_FEATURES_RRECOMMENDS = ""
7 7
8
9PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" 8PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
10PREFERRED_VERSION_virtual/kernel ?= "3.0.1" 9PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
11PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers" 10PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
12 11
13KERNEL_IMAGETYPE = "uImage" 12KERNEL_IMAGETYPE ?= "uImage"
14# disable the images below for now 13# disable the images below for now
15# ext2.bz2 ext2.lzma \ 14# ext2.bz2 ext2.lzma \
16# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" 15# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf
index c12dc0a..8a50bec 100644
--- a/conf/machine/p1022ds.conf
+++ b/conf/machine/p1022ds.conf
@@ -8,7 +8,7 @@ UBOOT_MACHINES = "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_3
8KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1022ds.dts" 8KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1022ds.dts"
9KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig" 9KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
10 10
11PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite" 11PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg-lite"
12 12
13XSERVER = " \ 13XSERVER = " \
14 xserver-xorg-lite \ 14 xserver-xorg-lite \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-20 17:33:17 +0000