Skip to content

Fix finding the dtb after the kernel image location refactoring#30

Merged
nathanchance merged 2 commits into
ClangBuiltLinux:masterfrom
nathanchance:fix-dtbs
Jan 10, 2021
Merged

Fix finding the dtb after the kernel image location refactoring#30
nathanchance merged 2 commits into
ClangBuiltLinux:masterfrom
nathanchance:fix-dtbs

Conversation

@nathanchance

Copy link
Copy Markdown
Member

The first commit has the full details in the commit message.

The second one is a small quality of life change that I noticed while debugging this.

KBUILD_DIR is no longer defined, meaning we look for the required dtb in
/arch/arm/boot/dts, which obviously does not exist.

Do something similar for dtbs like the kernel image, where we look for
either a dts (kbuild output) or dtbs (tuxmake output) folder and error
if it cannot be found in either location.

Fixes: cc703a8 ("boot-qemu.sh: Allow the user to supply a kernel image directly")
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
There is no point in decompressing the rootfs before we make sure that
the kernel image and dtb can be found. Break this function apart because
we need to know the image location before ${ARCH} is reassigned but we
can decompress the image once we know we are actually going to call the
QEMU binary.

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

@msfjarvis msfjarvis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nathanchance nathanchance merged commit 3b3d0d9 into ClangBuiltLinux:master Jan 10, 2021
@nathanchance

Copy link
Copy Markdown
Member Author

Thanks for the review!

@nathanchance nathanchance deleted the fix-dtbs branch January 10, 2021 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants