From: Michal Sojka Date: Thu, 17 May 2018 11:05:45 +0000 (+0200) Subject: Unify jailhouse and linux boot scripts X-Git-Tag: 0.0~16 X-Git-Url: https://rtime.felk.cvut.cz/gitweb/hercules2020/jailhouse-build.git/commitdiff_plain/c63794b1c4de3dedfab782e258bdd5ea9b60a677 Unify jailhouse and linux boot scripts --- diff --git a/build/boot b/build/boot index 82766b3..3c1b1d5 100755 --- a/build/boot +++ b/build/boot @@ -1,9 +1,3 @@ -#!/usr/bin/env novaboot +#!/bin/sh -# Boot localy built Linux kernel and initramfs and start Jailhouse during boot - -load linux-4.4/arch/arm64/boot/Image jailhouse mem=7808M vmalloc=512M console=ttyS0,115200n8 OS=l4t fbcon=map:0 net.ifnames=0 memtype=0 video=tegrafb no_console_suspend=1 earlycon=uart8250,mmio32,0x03100000 nvdumper_reserved=0x2772e0000 gpt tegraid=18.1.2.0.0 tegra_keep_boot_clocks maxcpus=6 androidboot.serialno=0320418051135 bl_prof_dataptr=0x10000@0x277240000 sdhci_tegra.en_boot_part_access=1 -load buildroot/images/rootfs.cpio.uboot - -# Use FDT prepared by firmware at address fdt_addr -UBOOT_CMD=booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr} +$(dirname $0)/boot-linux -a jailhouse "$@" diff --git a/build/boot-linux b/build/boot-linux index e7973c1..7dd28ab 100755 --- a/build/boot-linux +++ b/build/boot-linux @@ -2,7 +2,7 @@ # Boot localy built Linux kernel and initramfs -load linux-4.4/arch/arm64/boot/Image console=ttyS0,115200n8 OS=l4t fbcon=map:0 net.ifnames=0 memtype=0 video=tegrafb no_console_suspend=1 earlycon=uart8250,mmio32,0x03100000 nvdumper_reserved=0x2772e0000 gpt tegraid=18.1.2.0.0 tegra_keep_boot_clocks maxcpus=6 androidboot.serialno=0320418051135 bl_prof_dataptr=0x10000@0x277240000 sdhci_tegra.en_boot_part_access=1 +load linux-4.4/arch/arm64/boot/Image mem=7808M vmalloc=512M console=ttyS0,115200n8 OS=l4t fbcon=map:0 net.ifnames=0 memtype=0 video=tegrafb no_console_suspend=1 earlycon=uart8250,mmio32,0x03100000 nvdumper_reserved=0x2772e0000 gpt tegraid=18.1.2.0.0 tegra_keep_boot_clocks maxcpus=6 androidboot.serialno=0320418051135 bl_prof_dataptr=0x10000@0x277240000 sdhci_tegra.en_boot_part_access=1 #load linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb load buildroot/images/rootfs.cpio.uboot