Move default images types built into image recipes

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 e79a91a9454620d358f0355f456f664d41fb6a1a..a8eb16b3e8d389c00acd46c2e422c82a408619ca 100644 (file)
--- a/meta-fsl-ppc/conf/machine/e500mc.inc
+++ b/meta-fsl-ppc/conf/machine/e500mc.inc
@@ -11,7 +11,6 @@ PREFERRED_VERSION_virtual/kernel = "3.0.1"
 PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers"
 
 KERNEL_IMAGETYPE = "uImage"
-IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot"
 # 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 2bed583d0823001a608673bf3c88d2b8de4b5c92..d529b3f92ec76e9eb7d9a192ca9198dc4ce11804 100644 (file)
--- a/meta-fsl-ppc/conf/machine/e500v2.inc
+++ b/meta-fsl-ppc/conf/machine/e500v2.inc
@@ -10,7 +10,6 @@ PREFERRED_VERSION_virtual/kernel = "3.0.1"
 PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers"
 
 KERNEL_IMAGETYPE = "uImage"
-IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot"
 # 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 069349aaf6a5852af2d43062540b01709b3104e3..03cb2dbcf7f24348d3f1cf0577f9b7caf3e2b8bd 100644 (file)
--- a/meta-fsl-ppc/conf/machine/e5500-64b.inc
+++ b/meta-fsl-ppc/conf/machine/e5500-64b.inc
@@ -11,7 +11,6 @@ PREFERRED_VERSION_virtual/kernel = "3.0.1"
 PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers"
 
 KERNEL_IMAGETYPE = "uImage"
-IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot"
 # 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 ca9cfd325dc1002be2fd26838813e3bbcbb74806..471bb22debec31ae034f8e523b4a58983024d315 100644 (file)
--- a/meta-fsl-ppc/conf/machine/e5500.inc
+++ b/meta-fsl-ppc/conf/machine/e5500.inc
@@ -11,7 +11,6 @@ PREFERRED_VERSION_virtual/kernel ?= "3.0.1"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
 
 KERNEL_IMAGETYPE = "uImage"
-IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot"
 # 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/images/fsl-image-lsb-sdk.bb b/meta-fsl-ppc/images/fsl-image-lsb-sdk.bb
index 04b941b136a4ce99fa5282f7edcef0832c664c06..c4fff429175b7d97da0cc608ce251d61c4f05e8d 100644 (file)
--- a/meta-fsl-ppc/images/fsl-image-lsb-sdk.bb
+++ b/meta-fsl-ppc/images/fsl-image-lsb-sdk.bb
@@ -14,3 +14,5 @@ IMAGE_INSTALL = "\
     "
 
 inherit core-image
+
+IMAGE_FSTYPES ?= "nfsroot"

diff --git a/meta-fsl-ppc/images/fsl-image-lsb.bb b/meta-fsl-ppc/images/fsl-image-lsb.bb
index bb743b49e4e02c2cb61a1a649a2134ecd15d079a..47f4c38df4b49a8f10ce10f718d3e6c022865ddc 100644 (file)
--- a/meta-fsl-ppc/images/fsl-image-lsb.bb
+++ b/meta-fsl-ppc/images/fsl-image-lsb.bb
@@ -8,3 +8,5 @@ IMAGE_INSTALL = "\
     "
 
 inherit core-image
+
+IMAGE_FSTYPES ?= "nfsroot"

diff --git a/meta-fsl-ppc/images/fsl-image-minimal.bb b/meta-fsl-ppc/images/fsl-image-minimal.bb
index 74bce63fa604ae8840132664a91556cfbde9606a..a290d8be95823445855d14e5bece432cb12f3069 100644 (file)
--- a/meta-fsl-ppc/images/fsl-image-minimal.bb
+++ b/meta-fsl-ppc/images/fsl-image-minimal.bb
@@ -12,3 +12,5 @@ IMAGE_ROOTFS_SIZE = "8192"
 
 # remove not needed ipkg informations
 ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
+
+IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot"