summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2017-11-06 09:30:50 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2017-11-06 09:43:26 -0200
commit06178400afbd641a6709473fd21d893dcd3cfbfa (patch)
treef5f0072796561352f90156b72e2858b0d1fe8179
parent10d8ccb5ff2c31d2a5b13e088a8ec9511cbc3e72 (diff)
downloadmeta-freescale-06178400afbd641a6709473fd21d893dcd3cfbfa.tar.gz
Stop using image_types_uboot class
OE-Core now uses the CONVERSION TYPES to implement the U-Boot support so the class has been removed. This commit removes the code which inherits it so allowing it to keep working with the new code base. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> (cherry picked from commit 54544ad1ff48274463977b14c7872872d770ce33)
-rw-r--r--classes/mfgtool-initramfs-image.bbclass3
-rw-r--r--conf/machine/include/qoriq-base.inc2
2 files changed, 1 insertions, 4 deletions
diff --git a/classes/mfgtool-initramfs-image.bbclass b/classes/mfgtool-initramfs-image.bbclass
index afe5124a..65028b8f 100644
--- a/classes/mfgtool-initramfs-image.bbclass
+++ b/classes/mfgtool-initramfs-image.bbclass
@@ -4,7 +4,7 @@
4# image provides the utilities which are used, in the target, during 4# image provides the utilities which are used, in the target, during
5# the process and receive the commands from the MfgTool application. 5# the process and receive the commands from the MfgTool application.
6# 6#
7# Copyright 2014, 2016 (C) O.S. Systems Software LTDA. 7# Copyright 2014-2017 (C) O.S. Systems Software LTDA.
8 8
9DEPENDS += "u-boot-mfgtool linux-mfgtool" 9DEPENDS += "u-boot-mfgtool linux-mfgtool"
10 10
@@ -15,7 +15,6 @@ FEATURE_PACKAGES_f2fs = "packagegroup-fsl-mfgtool-f2fs"
15IMAGE_FSTYPES = "cpio.gz.u-boot" 15IMAGE_FSTYPES = "cpio.gz.u-boot"
16IMAGE_FSTYPES_mxs = "cpio.gz.u-boot" 16IMAGE_FSTYPES_mxs = "cpio.gz.u-boot"
17IMAGE_ROOTFS_SIZE ?= "8192" 17IMAGE_ROOTFS_SIZE ?= "8192"
18IMAGE_CLASSES += "image_types_uboot"
19 18
20# Filesystems enabled by default 19# Filesystems enabled by default
21DEFAULT_FS_SUPPORT = " \ 20DEFAULT_FS_SUPPORT = " \
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index 6c25d50e..2210cf52 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -9,8 +9,6 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
9PREFERRED_PROVIDER_qemu = "qemu-qoriq" 9PREFERRED_PROVIDER_qemu = "qemu-qoriq"
10PREFERRED_VERSION_testfloat = "2a" 10PREFERRED_VERSION_testfloat = "2a"
11 11
12IMAGE_CLASSES += "image_types_uboot"
13
14SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz ext2.gz.u-boot ext2.gz" 12SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz ext2.gz.u-boot ext2.gz"
15IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" 13IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
16 14