diff options
author | Saul Wold <sgw@linux.intel.com> | 2017-12-04 17:10:33 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-02 17:24:37 +0000 |
commit | 233be758030172df971e868468ceb2714c06fbf0 (patch) | |
tree | 8a89f46f00466fd071b648d5105eb69b30f79fe3 | |
parent | a77b6ee767ced8d181e95c3662fa9584bf1bacba (diff) | |
download | poky-233be758030172df971e868468ceb2714c06fbf0.tar.gz |
image_types: Remove ELF type
As warned in a proir commit, it's time to remove the elf image type,
it is not long used anywhere (that I am aware of) and the mkelfimage
tool has been removed from the upstream coreboot code base.
(From OE-Core rev: 2781e8d608c0fd2108aeab294f982e9249793852)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/image_types.bbclass | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index e881d0cc2d..9188bed419 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -147,16 +147,6 @@ IMAGE_CMD_cpio () { | |||
147 | fi | 147 | fi |
148 | } | 148 | } |
149 | 149 | ||
150 | ELF_KERNEL ?= "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}" | ||
151 | ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console=" | ||
152 | |||
153 | IMAGE_CMD_elf () { | ||
154 | test -f ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf && rm -f ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf | ||
155 | mkelfImage --kernel=${ELF_KERNEL} --initrd=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.cpio.gz --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf --append='${ELF_APPEND}' ${EXTRA_IMAGECMD} | ||
156 | } | ||
157 | |||
158 | IMAGE_TYPEDEP_elf = "cpio.gz" | ||
159 | |||
160 | UBI_VOLNAME ?= "${MACHINE}-rootfs" | 150 | UBI_VOLNAME ?= "${MACHINE}-rootfs" |
161 | 151 | ||
162 | multiubi_mkfs() { | 152 | multiubi_mkfs() { |
@@ -230,7 +220,6 @@ EXTRA_IMAGECMD_ext2 ?= "-i 4096" | |||
230 | EXTRA_IMAGECMD_ext3 ?= "-i 4096" | 220 | EXTRA_IMAGECMD_ext3 ?= "-i 4096" |
231 | EXTRA_IMAGECMD_ext4 ?= "-i 4096" | 221 | EXTRA_IMAGECMD_ext4 ?= "-i 4096" |
232 | EXTRA_IMAGECMD_btrfs ?= "-n 4096" | 222 | EXTRA_IMAGECMD_btrfs ?= "-n 4096" |
233 | EXTRA_IMAGECMD_elf ?= "" | ||
234 | 223 | ||
235 | do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot" | 224 | do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot" |
236 | do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot" | 225 | do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot" |
@@ -242,7 +231,6 @@ do_image_squashfs[depends] += "squashfs-tools-native:do_populate_sysroot" | |||
242 | do_image_squashfs_xz[depends] += "squashfs-tools-native:do_populate_sysroot" | 231 | do_image_squashfs_xz[depends] += "squashfs-tools-native:do_populate_sysroot" |
243 | do_image_squashfs_lzo[depends] += "squashfs-tools-native:do_populate_sysroot" | 232 | do_image_squashfs_lzo[depends] += "squashfs-tools-native:do_populate_sysroot" |
244 | do_image_squashfs_lz4[depends] += "squashfs-tools-native:do_populate_sysroot" | 233 | do_image_squashfs_lz4[depends] += "squashfs-tools-native:do_populate_sysroot" |
245 | do_image_elf[depends] += "virtual/kernel:do_populate_sysroot mkelfimage-native:do_populate_sysroot" | ||
246 | do_image_ubi[depends] += "mtd-utils-native:do_populate_sysroot" | 234 | do_image_ubi[depends] += "mtd-utils-native:do_populate_sysroot" |
247 | do_image_ubifs[depends] += "mtd-utils-native:do_populate_sysroot" | 235 | do_image_ubifs[depends] += "mtd-utils-native:do_populate_sysroot" |
248 | do_image_multiubi[depends] += "mtd-utils-native:do_populate_sysroot" | 236 | do_image_multiubi[depends] += "mtd-utils-native:do_populate_sysroot" |
@@ -261,7 +249,6 @@ IMAGE_TYPES = " \ | |||
261 | ubi ubifs multiubi \ | 249 | ubi ubifs multiubi \ |
262 | tar tar.gz tar.bz2 tar.xz tar.lz4 \ | 250 | tar tar.gz tar.bz2 tar.xz tar.lz4 \ |
263 | cpio cpio.gz cpio.xz cpio.lzma cpio.lz4 \ | 251 | cpio cpio.gz cpio.xz cpio.lzma cpio.lz4 \ |
264 | elf \ | ||
265 | wic wic.gz wic.bz2 wic.lzma \ | 252 | wic wic.gz wic.bz2 wic.lzma \ |
266 | container \ | 253 | container \ |
267 | " | 254 | " |