summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2019-09-20 06:48:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-27 13:02:17 +0100
commit2c58079222310443f08df51e9fd6ce234e7e0019 (patch)
treefc4e22dc5acf211fe3b6ad12e5cb95921e845152
parent13a2e8d9cc112c548257c2ce5c4b2b4aaed0546f (diff)
downloadpoky-2c58079222310443f08df51e9fd6ce234e7e0019.tar.gz
kernel.fitimage.bbclass: remove ramdisk_ctype
set in the ramdisk node the compression property always to "none", as U-Boot nowadays since commit: b1307f884a91 ("fit: Support compression for non-kernel components (e.g. FDT)") decompress non kernel components. Setting compression to the used comression algorithm now, will end in fail of your kernel boot with the ramdisk. This issue is fixed since commit: bddd98573465 ("fit: Do not automatically decompress ramdisk images") which now prints a warning in U-Boot, instead of decompressing the ramdisk, but we should setup compression property correct. (From OE-Core rev: f963a51544a9a7b1abbaa87c95b3c0279847d697) Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-fitimage.bbclass21
1 files changed, 1 insertions, 20 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index b51882dce4..1bcb09c598 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -207,7 +207,6 @@ EOF
207fitimage_emit_section_ramdisk() { 207fitimage_emit_section_ramdisk() {
208 208
209 ramdisk_csum="${FIT_HASH_ALG}" 209 ramdisk_csum="${FIT_HASH_ALG}"
210 ramdisk_ctype="none"
211 ramdisk_loadline="" 210 ramdisk_loadline=""
212 ramdisk_entryline="" 211 ramdisk_entryline=""
213 212
@@ -218,24 +217,6 @@ fitimage_emit_section_ramdisk() {
218 ramdisk_entryline="entry = <${UBOOT_RD_ENTRYPOINT}>;" 217 ramdisk_entryline="entry = <${UBOOT_RD_ENTRYPOINT}>;"
219 fi 218 fi
220 219
221 case $3 in
222 *.gz)
223 ramdisk_ctype="gzip"
224 ;;
225 *.bz2)
226 ramdisk_ctype="bzip2"
227 ;;
228 *.lzma)
229 ramdisk_ctype="lzma"
230 ;;
231 *.lzo)
232 ramdisk_ctype="lzo"
233 ;;
234 *.lz4)
235 ramdisk_ctype="lz4"
236 ;;
237 esac
238
239 cat << EOF >> ${1} 220 cat << EOF >> ${1}
240 ramdisk@${2} { 221 ramdisk@${2} {
241 description = "${INITRAMFS_IMAGE}"; 222 description = "${INITRAMFS_IMAGE}";
@@ -243,7 +224,7 @@ fitimage_emit_section_ramdisk() {
243 type = "ramdisk"; 224 type = "ramdisk";
244 arch = "${UBOOT_ARCH}"; 225 arch = "${UBOOT_ARCH}";
245 os = "linux"; 226 os = "linux";
246 compression = "${ramdisk_ctype}"; 227 compression = "none";
247 ${ramdisk_loadline} 228 ${ramdisk_loadline}
248 ${ramdisk_entryline} 229 ${ramdisk_entryline}
249 hash@1 { 230 hash@1 {