summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-09-30 11:07:53 -0700
committerMatthew McClintock <msm@freescale.com>2012-10-01 11:04:25 -0500
commit0976cebe5369747024107234a52e09781c7835f7 (patch)
treece664d9bd60b5b1e3bd0a2390b59f687fdc6feb1
parent546935878f2f2010cba5ad5f34233eed255b7682 (diff)
downloadmeta-fsl-ppc-0976cebe5369747024107234a52e09781c7835f7.tar.gz
machines: Recommend u-boot using MACHINE_EXTRA_RRECOMMENDS
Delete unused MACHINE_FEATURES_RRECOMMENDS Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--conf/machine/e500mc.inc3
-rw-r--r--conf/machine/e500v2.inc3
-rw-r--r--conf/machine/e5500-64b.inc3
-rw-r--r--conf/machine/e5500.inc3
4 files changed, 4 insertions, 8 deletions
diff --git a/conf/machine/e500mc.inc b/conf/machine/e500mc.inc
index a72ea5f..505d805 100644
--- a/conf/machine/e500mc.inc
+++ b/conf/machine/e500mc.inc
@@ -3,7 +3,7 @@ TARGET_FPU = "hard"
3require conf/machine/include/tune-ppce500mc.inc 3require conf/machine/include/tune-ppce500mc.inc
4 4
5MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" 5MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
6MACHINE_FEATURES_RRECOMMENDS = "" 6MACHINE_EXTRA_RRECOMMENDS = "u-boot"
7 7
8PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" 8PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
9PREFERRED_VERSION_virtual/kernel ?= "3.0.34" 9PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
@@ -16,4 +16,3 @@ KERNEL_IMAGETYPE ?= "uImage"
16# 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"
17 17
18MACHINEOVERRIDES .= ":e500mc:fslmachine" 18MACHINEOVERRIDES .= ":e500mc:fslmachine"
19EXTRA_IMAGEDEPENDS += "u-boot"
diff --git a/conf/machine/e500v2.inc b/conf/machine/e500v2.inc
index 23d1bb5..12086f7 100644
--- a/conf/machine/e500v2.inc
+++ b/conf/machine/e500v2.inc
@@ -1,7 +1,7 @@
1require conf/machine/include/tune-ppce500v2.inc 1require conf/machine/include/tune-ppce500v2.inc
2 2
3MACHINE_FEATURES = "kernel26 pci ext2 ext3 serial" 3MACHINE_FEATURES = "kernel26 pci ext2 ext3 serial"
4MACHINE_EXTRA_RRECOMMENDS = "" 4MACHINE_EXTRA_RRECOMMENDS = "u-boot"
5 5
6PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" 6PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
7PREFERRED_VERSION_virtual/kernel ?= "3.0.34" 7PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
@@ -14,4 +14,3 @@ KERNEL_IMAGETYPE ?= "uImage"
14# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" 14# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
15 15
16MACHINEOVERRIDES .= ":e500v2:fslmachine" 16MACHINEOVERRIDES .= ":e500v2:fslmachine"
17EXTRA_IMAGEDEPENDS += "u-boot"
diff --git a/conf/machine/e5500-64b.inc b/conf/machine/e5500-64b.inc
index d88e14f..650585f 100644
--- a/conf/machine/e5500-64b.inc
+++ b/conf/machine/e5500-64b.inc
@@ -4,7 +4,7 @@ DEFAULTTUNE ?= "ppc64e5500"
4require conf/machine/include/tune-ppce5500.inc 4require conf/machine/include/tune-ppce5500.inc
5 5
6MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" 6MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
7MACHINE_FEATURES_RRECOMMENDS = "" 7MACHINE_EXTRA_RRECOMMENDS = "u-boot"
8 8
9PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" 9PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
10PREFERRED_VERSION_virtual/kernel ?= "3.0.34" 10PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
@@ -17,4 +17,3 @@ KERNEL_IMAGETYPE ?= "uImage"
17# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" 17# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
18 18
19MACHINEOVERRIDES .= ":e5500-64b:fslmachine" 19MACHINEOVERRIDES .= ":e5500-64b:fslmachine"
20EXTRA_IMAGEDEPENDS += "u-boot"
diff --git a/conf/machine/e5500.inc b/conf/machine/e5500.inc
index 05facea..1a1bb20 100644
--- a/conf/machine/e5500.inc
+++ b/conf/machine/e5500.inc
@@ -3,7 +3,7 @@ TARGET_FPU = "hard"
3require conf/machine/include/tune-ppce5500.inc 3require conf/machine/include/tune-ppce5500.inc
4 4
5MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" 5MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
6MACHINE_FEATURES_RRECOMMENDS = "" 6MACHINE_EXTRA_RRECOMMENDS = "u-boot"
7 7
8PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" 8PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
9PREFERRED_VERSION_virtual/kernel ?= "3.0.34" 9PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
@@ -16,4 +16,3 @@ KERNEL_IMAGETYPE ?= "uImage"
16# 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"
17 17
18MACHINEOVERRIDES .= ":e5500:fslmachine" 18MACHINEOVERRIDES .= ":e5500:fslmachine"
19EXTRA_IMAGEDEPENDS += "u-boot"