[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST v5 14/14] Debian: create boot.scr.nat when installing Xen on u-boot.
This boots the kernel we've build natively, where boot.xen boots Xen and boot.deb boots the original Debian kernel. Sometimes convenient when debugging issues. Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> --- v5: Rebased over Linux cmdline refactoring. v4: New patch --- Osstest/Debian.pm | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index d703e00..3c4ac5e 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -149,16 +149,28 @@ sub setupboot_uboot ($$$) { my $kern = "vmlinuz-$want_kernver"; my $initrd = "initrd.img-$want_kernver"; - my @xenkopt = uboot_common_kernel_bootargs($ho); + logm("Xen options: $xenhopt"); + + # Common kernel options + my @kopt = uboot_common_kernel_bootargs($ho); + + # Dom0 specific kernel options + my @xenkopt = @kopt; push @xenkopt, $xenkopt; # http://bugs.xenproject.org/xen/bug/45 push @xenkopt, "clk_ignore_unused" if $ho->{Suite} =~ m/wheezy|jessie/; $xenkopt = join ' ', @xenkopt; + logm("Dom0 Linux options: $xenkopt"); - logm("Xen options: $xenhopt"); - logm("Linux options: $xenkopt"); + # Native specific kernel options + my $natcons = get_host_native_linux_console($ho); + my @natkopt = @kopt; + push @natkopt, "console=$natcons" unless $natcons eq "NONE"; + + my $natkopt = join ' ', @natkopt; + logm("Native linux options: $natkopt"); my $early_commands = get_host_property($ho, 'UBootScriptEarlyCommands', ''); my $xen_addr_r = get_host_property($ho, 'UBootSetXenAddrR', undef); @@ -216,6 +228,20 @@ bootz \\\${xen_addr_r} - \\\${fdt_addr} EOF mkimage -A arm -T script -d /boot/boot.xen /boot/boot.scr.xen cp /boot/boot.scr.xen /boot/boot.scr + +# Create boot.scr.nat for convenience too +cat >/boot/boot.nat <<EOF +setenv bootargs $natkopt +${load_dtb} +echo Loading $kern +ext2load scsi 0 \\\${kernel_addr_r} $kern +echo Loading $initrd +ext2load scsi 0 \\\${ramdisk_addr_r} $initrd +echo Booting +bootz \\\${kernel_addr_r} \\\${ramdisk_addr_r}:\\\${filesize} \\\${fdt_addr} +EOF +mkimage -A arm -T script -d /boot/boot.nat /boot/boot.scr.nat + END }; -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |