diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/kernel-fitimage.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/kernel-uboot.bbclass | 3 | ||||
-rw-r--r-- | meta/classes/kernel-uimage.bbclass | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index 7e09b075ff..2112ae4cfa 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass | |||
@@ -148,7 +148,7 @@ fitimage_emit_section_kernel() { | |||
148 | kernel-$2 { | 148 | kernel-$2 { |
149 | description = "Linux kernel"; | 149 | description = "Linux kernel"; |
150 | data = /incbin/("$3"); | 150 | data = /incbin/("$3"); |
151 | type = "kernel"; | 151 | type = "${UBOOT_MKIMAGE_KERNEL_TYPE}"; |
152 | arch = "${UBOOT_ARCH}"; | 152 | arch = "${UBOOT_ARCH}"; |
153 | os = "linux"; | 153 | os = "linux"; |
154 | compression = "$4"; | 154 | compression = "$4"; |
diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass index 2facade818..1bc98e042d 100644 --- a/meta/classes/kernel-uboot.bbclass +++ b/meta/classes/kernel-uboot.bbclass | |||
@@ -2,6 +2,9 @@ | |||
2 | FIT_KERNEL_COMP_ALG ?= "gzip" | 2 | FIT_KERNEL_COMP_ALG ?= "gzip" |
3 | FIT_KERNEL_COMP_ALG_EXTENSION ?= ".gz" | 3 | FIT_KERNEL_COMP_ALG_EXTENSION ?= ".gz" |
4 | 4 | ||
5 | # Kernel image type passed to mkimage (i.e. kernel kernel_noload...) | ||
6 | UBOOT_MKIMAGE_KERNEL_TYPE ?= "kernel" | ||
7 | |||
5 | uboot_prep_kimage() { | 8 | uboot_prep_kimage() { |
6 | if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then | 9 | if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then |
7 | vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux" | 10 | vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux" |
diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass index cedb4fa070..2e661ea916 100644 --- a/meta/classes/kernel-uimage.bbclass +++ b/meta/classes/kernel-uimage.bbclass | |||
@@ -30,6 +30,6 @@ do_uboot_mkimage() { | |||
30 | awk '$3=="${UBOOT_ENTRYSYMBOL}" {print "0x"$1;exit}'` | 30 | awk '$3=="${UBOOT_ENTRYSYMBOL}" {print "0x"$1;exit}'` |
31 | fi | 31 | fi |
32 | 32 | ||
33 | uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C "${linux_comp}" -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${B}/arch/${ARCH}/boot/uImage | 33 | uboot-mkimage -A ${UBOOT_ARCH} -O linux -T ${UBOOT_MKIMAGE_KERNEL_TYPE} -C "${linux_comp}" -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${B}/arch/${ARCH}/boot/uImage |
34 | rm -f linux.bin | 34 | rm -f linux.bin |
35 | } | 35 | } |