diff options
| author | André Draszik <adraszik@tycoint.com> | 2017-09-20 10:41:54 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-25 14:14:16 +0100 |
| commit | c3ba13c44b75164fc74c1f5294f387dd5bb7be55 (patch) | |
| tree | 19b542027b8de41ecf1fdca9c5543e8a3e76d8d9 | |
| parent | 34f9bcb8d5d1f9ac80c7b333da5e0eb006d68c72 (diff) | |
| download | poky-c3ba13c44b75164fc74c1f5294f387dd5bb7be55.tar.gz | |
kernel-fitimage: unbreak UBOOT_ENTRYSYMBOL support
- vmlinux is located in ${B}, not ${S}.
- parsing of nm output got broken completely in commit
b406a89935f148779569fa3770776e009dd51f13 ("kernel-fitimage: add
initramfs support"), commit ec755d2524fcbd9dfded23a576f25c990d405a6c
in yocto
While at it, make awk exit on match to save a few CPU cycles.
(From OE-Core rev: 9d2ec9c046c4a9c6a842d28133d40639f5a65297)
Signed-off-by: André Draszik <adraszik@tycoint.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/kernel-fitimage.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index 6f1b7667bc..5583b4472e 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass | |||
| @@ -97,8 +97,8 @@ fitimage_emit_section_kernel() { | |||
| 97 | 97 | ||
| 98 | ENTRYPOINT=${UBOOT_ENTRYPOINT} | 98 | ENTRYPOINT=${UBOOT_ENTRYPOINT} |
| 99 | if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then | 99 | if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then |
| 100 | ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ | 100 | ENTRYPOINT=`${HOST_PREFIX}nm vmlinux | \ |
| 101 | awk '$4=="${UBOOT_ENTRYSYMBOL}" {print $2}'` | 101 | awk '$3=="${UBOOT_ENTRYSYMBOL}" {print "0x"$1;exit}'` |
| 102 | fi | 102 | fi |
| 103 | 103 | ||
| 104 | cat << EOF >> ${1} | 104 | cat << EOF >> ${1} |
