[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 2/8] tests/acceptance/boot_linux_console: Add raspi version=2
From: |
Luc Michel |
Subject: |
Re: [PATCH 2/8] tests/acceptance/boot_linux_console: Add raspi version=2 parameter |
Date: |
Mon, 17 Feb 2020 09:26:53 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.2 |
On 2/15/20 8:22 PM, Philippe Mathieu-Daudé wrote:
> We want to tests different Raspberry Pi machines. Refactor to
> take the board version as argument.
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Luc Michel <address@hidden>
> ---
> tests/acceptance/boot_linux_console.py | 21 +++++++++++++++------
> 1 file changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/tests/acceptance/boot_linux_console.py
> b/tests/acceptance/boot_linux_console.py
> index 8cfc758d42..a1b6e70d3f 100644
> --- a/tests/acceptance/boot_linux_console.py
> +++ b/tests/acceptance/boot_linux_console.py
> @@ -347,26 +347,34 @@ def test_arm_emcraft_sf2(self):
> self.vm.launch()
> self.wait_for_console_pattern('init started: BusyBox')
>
> - def do_test_arm_raspi2(self, uart_model):
> + def do_test_arm_raspi(self, version, uart_model):
> """
> The kernel can be rebuilt using the kernel source referenced
> and following the instructions on the on:
> https://www.raspberrypi.org/documentation/linux/kernel/building.md
> """
> serial_kernel_cmdline = {
> - 'pl011': 'earlycon=pl011,0x3f201000 console=ttyAMA0',
> + 'pl011': {
> + 2: 'earlycon=pl011,0x3f201000 console=ttyAMA0',
> + },
> + }
> + kernel = {
> + 2: '/boot/kernel7.img',
> + }
> + dtb = {
> + 2: '/boot/bcm2709-rpi-2-b.dtb',
> }
> deb_url = ('http://archive.raspberrypi.org/debian/'
> 'pool/main/r/raspberrypi-firmware/'
> 'raspberrypi-kernel_1.20190215-1_armhf.deb')
> deb_hash = 'cd284220b32128c5084037553db3c482426f3972'
> deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
> - kernel_path = self.extract_from_deb(deb_path, '/boot/kernel7.img')
> - dtb_path = self.extract_from_deb(deb_path,
> '/boot/bcm2709-rpi-2-b.dtb')
> + kernel_path = self.extract_from_deb(deb_path, kernel[version])
> + dtb_path = self.extract_from_deb(deb_path, dtb[version])
>
> self.vm.set_console()
> kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
> - serial_kernel_cmdline[uart_model])
> + serial_kernel_cmdline[uart_model][version])
> self.vm.add_args('-kernel', kernel_path,
> '-dtb', dtb_path,
> '-append', kernel_command_line)
> @@ -378,9 +386,10 @@ def test_arm_raspi2_uart0(self):
> """
> :avocado: tags=arch:arm
> :avocado: tags=machine:raspi2
> + :avocado: tags=cpu:cortex-a7
> :avocado: tags=device:pl011
> """
> - self.do_test_arm_raspi2('pl011')
> + self.do_test_arm_raspi(2, 'pl011')
>
> def test_arm_exynos4210_initrd(self):
> """
>
- [PATCH 0/8] hw/arm: Add raspi[0123] acceptance tests, Philippe Mathieu-Daudé, 2020/02/15
- [PATCH 1/8] tests/acceptance/boot_linux_console: Use raspi console model as key, Philippe Mathieu-Daudé, 2020/02/15
- [PATCH 2/8] tests/acceptance/boot_linux_console: Add raspi version=2 parameter, Philippe Mathieu-Daudé, 2020/02/15
- Re: [PATCH 2/8] tests/acceptance/boot_linux_console: Add raspi version=2 parameter,
Luc Michel <=
- [PATCH 3/8] tests/acceptance/boot_linux_console: Test the raspi1 console, Philippe Mathieu-Daudé, 2020/02/15
- [PATCH 4/8] tests/acceptance/boot_linux_console: Test the raspi0 console, Philippe Mathieu-Daudé, 2020/02/15
- [PATCH 5/8] tests/acceptance/boot_linux_console: Test the raspi1 AUX console, Philippe Mathieu-Daudé, 2020/02/15
- [PATCH 6/8] tests/boot_linux_console: Test booting U-Boot on the Raspberry Pi 2, Philippe Mathieu-Daudé, 2020/02/15
- [PATCH 7/8] tests/boot_linux_console: Test booting U-Boot on the Raspberry Pi 3, Philippe Mathieu-Daudé, 2020/02/15