From d5d84efdef4fc404c5fa60ac239fbdee8591263b Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 1 Oct 2015 16:01:26 +0100 Subject: [PATCH] Debian: Use dtbs from kernel dist when booting that kernel The kernel dist built by ts-kernel-build puts the corresponding dtbs into /boot/dtbs/$kvers. The host installer's dtbs remain in /boot/dtbs and are used when booting the native kernel. It's possible that this change will expose bugs which exist in the DTBs in previous kernel branches (3.18 and 4.1). I've not investigated, I think we should accept this possibility and deal with it via backport requests (and maybe some force pushes if appropriate) as necessary. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- Osstest/Debian.pm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index d56e410..6a23751 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -142,11 +142,22 @@ sub uboot_common_kernel_bootargs ($) return @bootargs; } -sub uboot_scr_load_dtb () { +# ts-host-install will install the OS-supplied dtbs directly into +# /boot/dtbs without a subdirectory, while the kernel dist tarball +# produced by ts-kernel-build will install the DTBS from that kernel +# into /boot/dtbs/$version. +# +# Therefore the optional $kvers argument allows the selection of +# either the OS-supplied DTBS (when undef) or those of a specific +# kernel built by osstest. +sub uboot_scr_load_dtb (;$) { + my ($kvers) = @_; + $kvers ||= ''; + $kvers .= '/' if $kvers; return <