]> xenbits.xensource.com Git - unikraft/unikraft.git/commitdiff
support/scripts/mkukimg: Add `Devicetree Blob` option
authorSergiu Moga <sergiu.moga@protonmail.com>
Sat, 20 May 2023 19:42:54 +0000 (22:42 +0300)
committerUnikraft <monkey@unikraft.io>
Fri, 11 Aug 2023 14:28:34 +0000 (14:28 +0000)
Support adding a `Devicetree Blob` trough the `-d` option.

Signed-off-by: Sergiu Moga <sergiu.moga@protonmail.com>
Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #910

support/scripts/mkukimg

index 6e14d722ff90b57d5b6830e46a77e5406e33d2a1..583c9223ac6495d13077fb09936c0599fbc4b6d9 100755 (executable)
@@ -13,6 +13,7 @@ usage()
        echo "  -i                         Path to initrd cpio file (optional)"
        echo "  -b                         Bootloader: grub (GRUB), ukefi (Unikraft EFI stub)"
        echo "  -a                         Architecture: X64 (x86_64), AA64 (Aarch64)"
+       echo "  -d                         Path to Devicetree Blob (optional, for ukefi only!)"
        exit 1
 }
 
@@ -21,6 +22,7 @@ OPTFORMAT="iso"
 OPTCMDLINE=""
 OPTOUTPUT=${1}
 OPTARCH=
+OPTDTB=
 
 # cleanup
 BUILDDIR=
@@ -87,6 +89,10 @@ mkukefiiso()
                sudo cp ${OPTCMDLINE} ${BUILDDIR}/mnt/EFI/BOOT/
        fi
 
+       if [ ! -z ${OPTDTB} ]; then
+               sudo cp ${OPTDTB} ${BUILDDIR}/mnt/EFI/BOOT/
+       fi
+
        sudo cp ${OPTKERNELIMG} ${BUILDDIR}/mnt/EFI/BOOT/BOOT${OPTARCH}.EFI
 
        sudo umount ${BUILDDIR}/mnt
@@ -94,11 +100,12 @@ mkukefiiso()
 
        mkdir ${BUILDDIR}/iso_dir
        cp ${BUILDDIR}/fs.img ${BUILDDIR}/iso_dir
+       echo ${OPTOUTPUT}
        xorriso -as mkisofs -R -f -e fs.img -no-emul-boot -o ${OPTOUTPUT} ${BUILDDIR}/iso_dir
 }
 
 # process options
-while getopts "hk:c:i:f:a:b:" OPT; do
+while getopts "hk:c:i:f:a:b:d" OPT; do
        case "${OPT}" in
                h)
                        usage
@@ -121,6 +128,9 @@ while getopts "hk:c:i:f:a:b:" OPT; do
                a)
                        OPTARCH="${OPTARG}"
                        ;;
+               d)
+                       OPTDTB="${OPTARG}"
+                       ;;
                *)
                        usage
                        ;;