From 7af43d2f4e533e5c7752ef3de04401d7fc4b4236 Mon Sep 17 00:00:00 2001 From: Anders Dellien Date: Tue, 8 Feb 2022 15:46:25 +0000 Subject: [PATCH 1/2] Remove Android 'nano' profile Signed-off-by: Anders Dellien --- tc0/run_model.sh | 12 +----------- tc1/run_model.sh | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/tc0/run_model.sh b/tc0/run_model.sh index 53af6cc..fda6e03 100755 --- a/tc0/run_model.sh +++ b/tc0/run_model.sh @@ -36,7 +36,7 @@ incorrect_script_use () { echo " [OPTIONS]" echo "OPTIONS:" echo "-m, --model path to model" - echo "-d, --distro distro version, values supported [poky, android-nano, android-swr]" + echo "-d, --distro distro version, values supported [poky, android-swr]" echo "-a, --avb [OPTIONAL] avb boot, values supported [true, false], DEFAULT: false" echo "-t, --tap-interface [OPTIONAL] tap interface" echo "-e, --extra-model-params [OPTIONAL] extra model parameters" @@ -136,16 +136,6 @@ case $DISTRO in poky) DISTRO_MODEL_PARAMS="--data board.dram=$YOCTO_OUTDIR/fitImage-core-image-minimal-tc0-tc0@0x20000000" ;; - android-nano) - [ -z "$ANDROID_PRODUCT_OUT" ] && echo "var ANDROID_PRODUCT_OUT is empty" && exit 1 - check_dir_exists_and_exit $ANDROID_PRODUCT_OUT "android build images" - check_substring_and_exit $ANDROID_PRODUCT_OUT "tc_nano" - check_android_images - DISTRO_MODEL_PARAMS="-C board.mmc.p_mmc_file=$ANDROID_PRODUCT_OUT/android.img" - [ "$AVB" == true ] || DISTRO_MODEL_PARAMS="$DISTRO_MODEL_PARAMS \ - --data board.dram=$ANDROID_PRODUCT_OUT/ramdisk_uboot.img@0x8000000 \ - --data board.dram=$YOCTO_OUTDIR/Image@0x80000 " - ;; android-swr) [ -z "$ANDROID_PRODUCT_OUT" ] && echo "var ANDROID_PRODUCT_OUT is empty" && exit 1 check_dir_exists_and_exit $ANDROID_PRODUCT_OUT "android build images" diff --git a/tc1/run_model.sh b/tc1/run_model.sh index 545df30..0e50161 100755 --- a/tc1/run_model.sh +++ b/tc1/run_model.sh @@ -36,7 +36,7 @@ incorrect_script_use () { echo " [OPTIONS]" echo "OPTIONS:" echo "-m, --model path to model" - echo "-d, --distro distro version, values supported [poky, android-nano, android-swr]" + echo "-d, --distro distro version, values supported [poky, android-swr]" echo "-a, --avb [OPTIONAL] avb boot, values supported [true, false], DEFAULT: false" echo "-t, --tap-interface [OPTIONAL] tap interface" echo "-e, --extra-model-params [OPTIONAL] extra model parameters" @@ -136,16 +136,6 @@ case $DISTRO in poky) DISTRO_MODEL_PARAMS="--data board.dram=$YOCTO_OUTDIR/fitImage-core-image-minimal-tc1-tc1@0x20000000" ;; - android-nano) - [ -z "$ANDROID_PRODUCT_OUT" ] && echo "var ANDROID_PRODUCT_OUT is empty" && exit 1 - check_dir_exists_and_exit $ANDROID_PRODUCT_OUT "android build images" - check_substring_and_exit $ANDROID_PRODUCT_OUT "tc_nano" - check_android_images - DISTRO_MODEL_PARAMS="-C board.mmc.p_mmc_file=$ANDROID_PRODUCT_OUT/android.img" - [ "$AVB" == true ] || DISTRO_MODEL_PARAMS="$DISTRO_MODEL_PARAMS \ - --data board.dram=$ANDROID_PRODUCT_OUT/ramdisk_uboot.img@0x8000000 \ - --data board.dram=$YOCTO_OUTDIR/Image@0x80000 " - ;; android-swr) [ -z "$ANDROID_PRODUCT_OUT" ] && echo "var ANDROID_PRODUCT_OUT is empty" && exit 1 check_dir_exists_and_exit $ANDROID_PRODUCT_OUT "android build images" -- GitLab From af6cc7ac080b6d5c1a3f4d25601f174bfa8e170e Mon Sep 17 00:00:00 2001 From: Anders Dellien Date: Tue, 8 Feb 2022 15:48:31 +0000 Subject: [PATCH 2/2] Update the name of the 'fip' binary Signed-off-by: Anders Dellien --- tc0/run_model.sh | 2 +- tc1/run_model.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tc0/run_model.sh b/tc0/run_model.sh index fda6e03..d65dc14 100755 --- a/tc0/run_model.sh +++ b/tc0/run_model.sh @@ -166,7 +166,7 @@ mkdir -p $LOGS_DIR "$MODEL" \ -C css.scp.ROMloader.fname=$YOCTO_OUTDIR/scp_romfw.bin \ -C css.trustedBootROMloader.fname=$YOCTO_OUTDIR/bl1-tc.bin \ - -C board.flashloader0.fname=$YOCTO_OUTDIR/fip-tc.bin \ + -C board.flashloader0.fname=$YOCTO_OUTDIR/fip_gpt-tc.bin \ -C soc.pl011_uart0.out_file=$LOGS_DIR/uart0_soc.log \ -C soc.pl011_uart0.unbuffered_output=1 \ -C soc.pl011_uart1.out_file=$LOGS_DIR/uart1_soc.log \ diff --git a/tc1/run_model.sh b/tc1/run_model.sh index 0e50161..a7f2352 100755 --- a/tc1/run_model.sh +++ b/tc1/run_model.sh @@ -166,7 +166,7 @@ mkdir -p $LOGS_DIR "$MODEL" \ -C css.scp.ROMloader.fname=$YOCTO_OUTDIR/scp_romfw.bin \ -C css.trustedBootROMloader.fname=$YOCTO_OUTDIR/bl1-tc.bin \ - -C board.flashloader0.fname=$YOCTO_OUTDIR/fip-tc.bin \ + -C board.flashloader0.fname=$YOCTO_OUTDIR/fip_gpt-tc.bin \ -C soc.pl011_uart0.out_file=$LOGS_DIR/uart0_soc.log \ -C soc.pl011_uart0.unbuffered_output=1 \ -C soc.pl011_uart1.out_file=$LOGS_DIR/uart1_soc.log \ -- GitLab