[u-boot-test-hooks PATCH 0/2] Aspeed updates
Hi Tom,
This updates the configuration for the aspeed machines, adding support for the ast2600.
Joel Stanley (2): ast2500: Simplify Qemu command line travis-ci: Add Aspeed AST2600 Qemu configuration
bin/travis-ci/conf.evb-ast2500_qemu | 2 +- bin/travis-ci/conf.evb-ast2600_qemu | 13 +++++++++++++ py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 bin/travis-ci/conf.evb-ast2600_qemu create mode 100644 py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py
The Aspeed machine in Qemu has appropriate defaults so we don't need to specify these options.
Signed-off-by: Joel Stanley joel@jms.id.au --- bin/travis-ci/conf.evb-ast2500_qemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/travis-ci/conf.evb-ast2500_qemu b/bin/travis-ci/conf.evb-ast2500_qemu index 7f0f3c56e006..2e9adc6af9b0 100644 --- a/bin/travis-ci/conf.evb-ast2500_qemu +++ b/bin/travis-ci/conf.evb-ast2500_qemu @@ -5,7 +5,7 @@ console_impl=qemu qemu_machine="ast2500-evb" 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_extra_args="-nographic -nic user,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=qemu_gen_padded_image
On 6/24/22 04:34, Joel Stanley wrote:
The Aspeed machine in Qemu has appropriate defaults so we don't need to specify these options.
Signed-off-by: Joel Stanley joel@jms.id.au
Reviewed-by: Cédric Le Goater clg@kaod.org
Thanks,
C.
bin/travis-ci/conf.evb-ast2500_qemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/travis-ci/conf.evb-ast2500_qemu b/bin/travis-ci/conf.evb-ast2500_qemu index 7f0f3c56e006..2e9adc6af9b0 100644 --- a/bin/travis-ci/conf.evb-ast2500_qemu +++ b/bin/travis-ci/conf.evb-ast2500_qemu @@ -5,7 +5,7 @@ console_impl=qemu qemu_machine="ast2500-evb" 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_extra_args="-nographic -nic user,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=qemu_gen_padded_image
Similar to the AST2500 this machine is emulated by Qemu. It boots from a 64MB SPI NOR flash device by default.
Signed-off-by: Joel Stanley joel@jms.id.au --- bin/travis-ci/conf.evb-ast2600_qemu | 13 +++++++++++++ py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 bin/travis-ci/conf.evb-ast2600_qemu create mode 100644 py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py
diff --git a/bin/travis-ci/conf.evb-ast2600_qemu b/bin/travis-ci/conf.evb-ast2600_qemu new file mode 100644 index 000000000000..386ff7d25774 --- /dev/null +++ b/bin/travis-ci/conf.evb-ast2600_qemu @@ -0,0 +1,13 @@ +# Copyright 2022 IBM Corp. +# Joel Stanley joel@jms.id.au +# SPDX-License-Identifier: GPL-2.0+ + +console_impl=qemu +qemu_machine="ast2600-evb" +qemu_binary="qemu-system-arm" +qemu_extra_args="-nographic -nic user,tftp=${UBOOT_TRAVIS_BUILD_DIR}" +qemu_kernel_args="-drive file=${U_BOOT_BUILD_DIR}/flash.img,format=raw,if=mtd" +flash_u_boot_bin="u-boot-with-spl.bin" +reset_impl=none +flash_impl=qemu_gen_padded_image +flash_size=64 diff --git a/py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py b/py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py new file mode 100644 index 000000000000..396261efa3a3 --- /dev/null +++ b/py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py @@ -0,0 +1,4 @@ +import travis_tftp + +env__net_dhcp_server = True +env__net_tftp_readable_file = travis_tftp.file2env('u-boot')
On 6/24/22 04:34, Joel Stanley wrote:
Similar to the AST2500 this machine is emulated by Qemu. It boots from a 64MB SPI NOR flash device by default.
Signed-off-by: Joel Stanley joel@jms.id.au
Reviewed-by: Cédric Le Goater clg@kaod.org
Thanks,
C.
bin/travis-ci/conf.evb-ast2600_qemu | 13 +++++++++++++ py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 bin/travis-ci/conf.evb-ast2600_qemu create mode 100644 py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py
diff --git a/bin/travis-ci/conf.evb-ast2600_qemu b/bin/travis-ci/conf.evb-ast2600_qemu new file mode 100644 index 000000000000..386ff7d25774 --- /dev/null +++ b/bin/travis-ci/conf.evb-ast2600_qemu @@ -0,0 +1,13 @@ +# Copyright 2022 IBM Corp. +# Joel Stanley joel@jms.id.au +# SPDX-License-Identifier: GPL-2.0+
+console_impl=qemu +qemu_machine="ast2600-evb" +qemu_binary="qemu-system-arm" +qemu_extra_args="-nographic -nic user,tftp=${UBOOT_TRAVIS_BUILD_DIR}" +qemu_kernel_args="-drive file=${U_BOOT_BUILD_DIR}/flash.img,format=raw,if=mtd" +flash_u_boot_bin="u-boot-with-spl.bin" +reset_impl=none +flash_impl=qemu_gen_padded_image +flash_size=64 diff --git a/py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py b/py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py new file mode 100644 index 000000000000..396261efa3a3 --- /dev/null +++ b/py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py @@ -0,0 +1,4 @@ +import travis_tftp
+env__net_dhcp_server = True +env__net_tftp_readable_file = travis_tftp.file2env('u-boot')
On Fri, Jun 24, 2022 at 12:04:18PM +0930, Joel Stanley wrote:
Hi Tom,
This updates the configuration for the aspeed machines, adding support for the ast2600.
Joel Stanley (2): ast2500: Simplify Qemu command line travis-ci: Add Aspeed AST2600 Qemu configuration
bin/travis-ci/conf.evb-ast2500_qemu | 2 +- bin/travis-ci/conf.evb-ast2600_qemu | 13 +++++++++++++ py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 bin/travis-ci/conf.evb-ast2600_qemu create mode 100644 py/travis-ci/u_boot_boardenv_evb-ast2600_qemu.py
Thanks, I'll pick these up soon.
On Fri, 24 Jun 2022 12:04:18 +0930, Joel Stanley wrote:
This updates the configuration for the aspeed machines, adding support for the ast2600.
Joel Stanley (2): ast2500: Simplify Qemu command line travis-ci: Add Aspeed AST2600 Qemu configuration
[...]
Applied, thanks!
[1/2] ast2500: Simplify Qemu command line commit: 0a7395692b6f7e8ca4afc49b570e730a0d288646 [2/2] travis-ci: Add Aspeed AST2600 Qemu configuration commit: 457656fc43140eab1aab1380427a48ca89d6d462
Best regards,
participants (3)
-
Cédric Le Goater -
Joel Stanley -
Tom Rini