From 5ab4c084f0b64e7ad126c347f61ba240c456136a Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Tue, 9 Jun 2020 10:12:52 -0600 Subject: [PATCH] hooks: Rename flash.create_image_32mb This no longer creates only 32MB images. This "flashing" method is also only useful for qemu. Rename it to reflect these points. Signed-off-by: Stephen Warren --- test/hooks/bin/ellesmere/conf.evb-ast2500_qemu | 2 +- .../{flash.create_image_32mb => flash.qemu_gen_padded_image} | 0 test/hooks/bin/travis-ci/conf.evb-ast2500_qemu | 2 +- test/hooks/bin/travis-ci/conf.malta64_qemu | 2 +- test/hooks/bin/travis-ci/conf.malta64el_qemu | 2 +- test/hooks/bin/travis-ci/conf.malta_qemu | 2 +- test/hooks/bin/travis-ci/conf.maltael_qemu | 2 +- test/hooks/bin/travis-ci/conf.qemu_mips64_na | 2 +- test/hooks/bin/travis-ci/conf.qemu_mips64el_na | 2 +- test/hooks/bin/travis-ci/conf.qemu_mips_na | 2 +- test/hooks/bin/travis-ci/conf.qemu_mipsel_na | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename test/hooks/bin/{flash.create_image_32mb => flash.qemu_gen_padded_image} (100%) diff --git a/test/hooks/bin/ellesmere/conf.evb-ast2500_qemu b/test/hooks/bin/ellesmere/conf.evb-ast2500_qemu index 41406fe3811..7f0f3c56e00 100644 --- a/test/hooks/bin/ellesmere/conf.evb-ast2500_qemu +++ b/test/hooks/bin/ellesmere/conf.evb-ast2500_qemu @@ -8,4 +8,4 @@ qemu_binary="qemu-system-arm" qemu_extra_args="-nographic -m 512M -serial mon:stdio -net nic,model=ftgmac100 -net user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR}" qemu_kernel_args="-drive file=${U_BOOT_BUILD_DIR}/flash.img,format=raw,if=mtd" reset_impl=none -flash_impl=create_image_32mb +flash_impl=qemu_gen_padded_image diff --git a/test/hooks/bin/flash.create_image_32mb b/test/hooks/bin/flash.qemu_gen_padded_image similarity index 100% rename from test/hooks/bin/flash.create_image_32mb rename to test/hooks/bin/flash.qemu_gen_padded_image diff --git a/test/hooks/bin/travis-ci/conf.evb-ast2500_qemu b/test/hooks/bin/travis-ci/conf.evb-ast2500_qemu index 41406fe3811..7f0f3c56e00 100644 --- a/test/hooks/bin/travis-ci/conf.evb-ast2500_qemu +++ b/test/hooks/bin/travis-ci/conf.evb-ast2500_qemu @@ -8,4 +8,4 @@ qemu_binary="qemu-system-arm" qemu_extra_args="-nographic -m 512M -serial mon:stdio -net nic,model=ftgmac100 -net user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR}" qemu_kernel_args="-drive file=${U_BOOT_BUILD_DIR}/flash.img,format=raw,if=mtd" reset_impl=none -flash_impl=create_image_32mb +flash_impl=qemu_gen_padded_image diff --git a/test/hooks/bin/travis-ci/conf.malta64_qemu b/test/hooks/bin/travis-ci/conf.malta64_qemu index bc5a85ad16c..462591d2cfb 100644 --- a/test/hooks/bin/travis-ci/conf.malta64_qemu +++ b/test/hooks/bin/travis-ci/conf.malta64_qemu @@ -26,5 +26,5 @@ qemu_extra_args="-nographic -cpu MIPS64R2-generic -m 256" qemu_kernel_args="-drive if=pflash,file=${U_BOOT_BUILD_DIR}/flash.img,format=raw \ -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device pcnet,netdev=net0" reset_impl=none -flash_impl=create_image_32mb +flash_impl=qemu_gen_padded_image flash_size=4 diff --git a/test/hooks/bin/travis-ci/conf.malta64el_qemu b/test/hooks/bin/travis-ci/conf.malta64el_qemu index 7da5ef3fc70..5a35f1d71a6 100644 --- a/test/hooks/bin/travis-ci/conf.malta64el_qemu +++ b/test/hooks/bin/travis-ci/conf.malta64el_qemu @@ -26,6 +26,6 @@ qemu_extra_args="-nographic -cpu MIPS64R2-generic -m 256" qemu_kernel_args="-drive if=pflash,file=${U_BOOT_BUILD_DIR}/flash.img,format=raw \ -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device pcnet,netdev=net0" reset_impl=none -flash_impl=create_image_32mb +flash_impl=qemu_gen_padded_image flash_size=4 flash_u_boot_bin=u-boot-swap.bin diff --git a/test/hooks/bin/travis-ci/conf.malta_qemu b/test/hooks/bin/travis-ci/conf.malta_qemu index ebe38d6a1ab..a2b39a4ba66 100644 --- a/test/hooks/bin/travis-ci/conf.malta_qemu +++ b/test/hooks/bin/travis-ci/conf.malta_qemu @@ -26,5 +26,5 @@ qemu_extra_args="-nographic -cpu 24Kc -m 256" qemu_kernel_args="-drive if=pflash,file=${U_BOOT_BUILD_DIR}/flash.img,format=raw \ -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device pcnet,netdev=net0" reset_impl=none -flash_impl=create_image_32mb +flash_impl=qemu_gen_padded_image flash_size=4 diff --git a/test/hooks/bin/travis-ci/conf.maltael_qemu b/test/hooks/bin/travis-ci/conf.maltael_qemu index 4f6a2898c7d..8b73e51f385 100644 --- a/test/hooks/bin/travis-ci/conf.maltael_qemu +++ b/test/hooks/bin/travis-ci/conf.maltael_qemu @@ -26,6 +26,6 @@ qemu_extra_args="-nographic -cpu 24Kc -m 256" qemu_kernel_args="-drive if=pflash,file=${U_BOOT_BUILD_DIR}/flash.img,format=raw \ -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device pcnet,netdev=net0" reset_impl=none -flash_impl=create_image_32mb +flash_impl=qemu_gen_padded_image flash_size=4 flash_u_boot_bin=u-boot-swap.bin diff --git a/test/hooks/bin/travis-ci/conf.qemu_mips64_na b/test/hooks/bin/travis-ci/conf.qemu_mips64_na index f00c99fcd9a..dd096a8c5a8 100644 --- a/test/hooks/bin/travis-ci/conf.qemu_mips64_na +++ b/test/hooks/bin/travis-ci/conf.qemu_mips64_na @@ -24,5 +24,5 @@ qemu_binary="qemu-system-mips64" qemu_extra_args="-nographic -monitor null -cpu MIPS64R2-generic" qemu_kernel_args="-drive if=pflash,file=${U_BOOT_BUILD_DIR}/flash.img,format=raw" reset_impl=none -flash_impl="create_image_32mb" +flash_impl="qemu_gen_padded_image" flash_size=4 diff --git a/test/hooks/bin/travis-ci/conf.qemu_mips64el_na b/test/hooks/bin/travis-ci/conf.qemu_mips64el_na index 7555a0b19a4..a8a213296ce 100644 --- a/test/hooks/bin/travis-ci/conf.qemu_mips64el_na +++ b/test/hooks/bin/travis-ci/conf.qemu_mips64el_na @@ -24,5 +24,5 @@ qemu_binary="qemu-system-mips64el" qemu_extra_args="-nographic -monitor null -cpu MIPS64R2-generic" qemu_kernel_args="-drive if=pflash,file=${U_BOOT_BUILD_DIR}/flash.img,format=raw" reset_impl=none -flash_impl="create_image_32mb" +flash_impl="qemu_gen_padded_image" flash_size=4 diff --git a/test/hooks/bin/travis-ci/conf.qemu_mips_na b/test/hooks/bin/travis-ci/conf.qemu_mips_na index dfdad0cd5e2..a5e2a437b9f 100644 --- a/test/hooks/bin/travis-ci/conf.qemu_mips_na +++ b/test/hooks/bin/travis-ci/conf.qemu_mips_na @@ -24,5 +24,5 @@ qemu_binary="qemu-system-mips" qemu_extra_args="-nographic -monitor null" qemu_kernel_args="-drive if=pflash,file=${U_BOOT_BUILD_DIR}/flash.img,format=raw" reset_impl=none -flash_impl="create_image_32mb" +flash_impl="qemu_gen_padded_image" flash_size=4 diff --git a/test/hooks/bin/travis-ci/conf.qemu_mipsel_na b/test/hooks/bin/travis-ci/conf.qemu_mipsel_na index 1b3de814897..6481f24ce3f 100644 --- a/test/hooks/bin/travis-ci/conf.qemu_mipsel_na +++ b/test/hooks/bin/travis-ci/conf.qemu_mipsel_na @@ -24,5 +24,5 @@ qemu_binary="qemu-system-mipsel" qemu_extra_args="-nographic -monitor null" qemu_kernel_args="-drive if=pflash,file=${U_BOOT_BUILD_DIR}/flash.img,format=raw" reset_impl=none -flash_impl="create_image_32mb" +flash_impl="qemu_gen_padded_image" flash_size=4