diff options
author | Ryan Harkin <ryan.harkin@linaro.org> | 2016-02-03 14:45:26 +0000 |
---|---|---|
committer | Ryan Harkin <ryan.harkin@linaro.org> | 2016-02-03 15:02:03 +0000 |
commit | 561ec323a13e31d3aed02803ab1576a0b037b5e1 (patch) | |
tree | d7668b5ff284b3c63abae5bf0864ea1ab8f09754 | |
parent | 2be1fef39c46987609d4fdc311af98519e8d990f (diff) |
Replace UEFI with bootmon for TC2
The upstream UEFI code is no longer able to boot the kernel directly, so
change TC2 to boot BusyBox, OE and Android with BootMon.
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rwxr-xr-x | build-target-bins.sh | 11 | ||||
-rw-r--r-- | variants/tc2-busybox | 5 |
2 files changed, 15 insertions, 1 deletions
diff --git a/build-target-bins.sh b/build-target-bins.sh index 4e5d8ce..658d0e3 100755 --- a/build-target-bins.sh +++ b/build-target-bins.sh @@ -262,6 +262,17 @@ do_package() fi + if [ "$BOOTMON_BUILD_ENABLED" == "1" ]; then + local outdir=${OUTDIR}/${VARIANT}/bootmon + local outfile=${outdir}/${BOOTMON_SCRIPT} + rm -f $outfile + mkdir -p ${outdir} + echo "fl linux fdt board.dtb" > $outfile + echo "fl linux initrd ramdisk.img" >> $outfile + echo "fl linux boot zImage console=ttyAMA0,38400 earlyprintk debug verbose rootwait root=/dev/sda2 androidboot.hardware=arm-versatileexpress-usb" >> $outfile + populate_variant $outdir bootmon + fi + if [ "$UBOOT_BUILD_ENABLED" == "1" ]; then if [ "${!uboot_out}" != "" ]; then # remove existing fip diff --git a/variants/tc2-busybox b/variants/tc2-busybox index de6806c..60d21c5 100644 --- a/variants/tc2-busybox +++ b/variants/tc2-busybox @@ -45,6 +45,9 @@ LINUX_IMAGE_TYPE=zImage DEVTREE_TREES=(vexpress-v2p-ca15_a7) DEVTREE_TREES_RENAME=(tc2.dtb) +BOOTMON_BUILD_ENABLED=1 +BOOTMON_SCRIPT="bootscr.txt" + UBOOT_BUILD_ENABLED=0 BUILD_SCRIPTS=$BUILD_SCRIPTS"build-uboot.sh " UBOOT_PATH=u-boot @@ -53,7 +56,7 @@ UBOOT_BOARDS="vexpress_ca15_tc2" UBOOT_OUTPUT_DESTS[vexpress_ca15_tc2_defconfig]=tc2 UBOOT_OUTPUT_FILENAME=boot-tc2.bin -UEFI_BUILD_ENABLED=1 +UEFI_BUILD_ENABLED=0 BUILD_SCRIPTS=$BUILD_SCRIPTS"build-uefi.sh " UEFI_PATH=uefi/edk2 UEFI_TOOLS_PATH=uefi/uefi-tools |