Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 879c26d4 authored by Geoff Levand's avatar Geoff Levand Committed by Michael Ellerman
Browse files

powerpc/ps3: Quieten boot wrapper output with run_cmd 



Add a boot wrapper script function run_cmd which will run a shell command
quietly and only print the output if either V=1 or an error occurs.

Also, run the ps3 dd commands with run_cmd to clean up the build output.

Signed-off-by: default avatarGeoff Levand <geoff@infradead.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 1856f50c

arch/powerpc/boot/wrapper

+21 −4
Original line number Diff line number Diff line
@@ -63,6 +63,23 @@ usage() { 
    exit 1

}



run_cmd() {

    if [ "$V" = 1 ]; then

        $* 2>&1

    else

        local msg



        set +e

        msg=$($* 2>&1)



        if [ $? -ne "0" ]; then

                echo $msg

                exit 1

        fi

        set -e

    fi

}



while [ "$#" -gt 0 ]; do

    case "$1" in

    -o)
@@ -456,11 +473,11 @@ ps3) 


    ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"



    dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \

    run_cmd dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \

        skip=$overlay_dest seek=$system_reset_kernel          \

        count=$overlay_size bs=1



    dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \

    run_cmd dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \

        skip=$system_reset_overlay seek=$overlay_dest         \

        count=$overlay_size bs=1