[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 22/30] tests/acceptance/boot_linux_console: Use raspi console
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 22/30] tests/acceptance/boot_linux_console: Use raspi console model as key |
Date: |
Thu, 6 Feb 2020 02:17:48 +0100 |
Python dictionary are not that expensive. Use a key makes the
code easier to review.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/acceptance/boot_linux_console.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/acceptance/boot_linux_console.py
b/tests/acceptance/boot_linux_console.py
index e40b84651b..5fba46a9d1 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -325,14 +325,14 @@ class BootLinuxConsole(Test):
self.vm.launch()
self.wait_for_console_pattern('init started: BusyBox')
- def do_test_arm_raspi2(self, uart_id):
+ def do_test_arm_raspi2(self, 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 = {
- 0: 'earlycon=pl011,0x3f201000 console=ttyAMA0',
+ 'pl011': 'earlycon=pl011,0x3f201000 console=ttyAMA0',
}
deb_url = ('http://archive.raspberrypi.org/debian/'
'pool/main/r/raspberrypi-firmware/'
@@ -344,7 +344,7 @@ class BootLinuxConsole(Test):
self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
- serial_kernel_cmdline[uart_id])
+ serial_kernel_cmdline[uart_model])
self.vm.add_args('-kernel', kernel_path,
'-dtb', dtb_path,
'-append', kernel_command_line)
@@ -358,7 +358,7 @@ class BootLinuxConsole(Test):
:avocado: tags=machine:raspi2
:avocado: tags=device:pl011
"""
- self.do_test_arm_raspi2(0)
+ self.do_test_arm_raspi2('pl011')
def test_arm_exynos4210_initrd(self):
"""
--
2.21.1
- [PATCH v2 14/30] hw/arm/bcm2836: Restrict BCM283XClass declaration to C source, (continued)
- [PATCH v2 14/30] hw/arm/bcm2836: Restrict BCM283XClass declaration to C source, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 15/30] hw/arm/bcm2836: QOM'ify more by adding class_init() to each SoC type, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 16/30] hw/arm/bcm2836: Introduce BCM283XClass::core_count, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 17/30] hw/arm/bcm2836: Only provide "enabled-cpus" property to multicore SoCs, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 18/30] hw/arm/bcm2836: Split out common realize() code, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 19/30] hw/arm/bcm2836: Introduce the BCM2835 SoC, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 20/30] hw/arm/raspi: Add the Raspberry Pi Zero machine, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 21/30] hw/arm/raspi: Add the Raspberry Pi B+ machine, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 24/30] tests/acceptance/boot_linux_console: Test the raspi1 console, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 23/30] tests/acceptance/boot_linux_console: Add raspi version=2 parameter, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 22/30] tests/acceptance/boot_linux_console: Use raspi console model as key,
Philippe Mathieu-Daudé <=
- [PATCH v2 25/30] tests/acceptance/boot_linux_console: Test the raspi0 console, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 26/30] python/qemu/machine: Allow to use other serial consoles than default, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 27/30] tests/acceptance/boot_linux_console: Test the raspi1 AUX console, Philippe Mathieu-Daudé, 2020/02/05
- [NOTFORMERGE PATCH v2 30/30] hw/arm/raspi: Add the Raspberry Pi 4, Philippe Mathieu-Daudé, 2020/02/05
- [NOTFORMERGE PATCH v2 29/30] hw/arm/bcm2836: Add the BCM2838 (ARMv8), Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 28/30] tests/acceptance: Count Raspberry Pi logos displayed on framebuffer, Philippe Mathieu-Daudé, 2020/02/05