Philippe Mathieu-Daudé <f4...@amsat.org> writes:
> The current do_test_arm_raspi2() case tests the PL011 UART0. > Our model also supports the AUX UART (16550 based). > We can very simply test the UART1 with Linux, modifying the > kernel command line. > > Add few lines to expand our previous test and cover the AUX > UART. > > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> Reviewed-by: Alex Bennée <alex.ben...@linaro.org> > --- > tests/acceptance/boot_linux_console.py | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/tests/acceptance/boot_linux_console.py > b/tests/acceptance/boot_linux_console.py > index 7eaf6cb60e..33e8f6c635 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -326,6 +326,7 @@ class BootLinuxConsole(Test): > """ > serial_kernel_cmdline = { > 0: 'earlycon=pl011,0x3f201000 console=ttyAMA0', > + 1: 'earlycon=uart8250,mmio32,0x3f215040 console=ttyS1,115200' > } > deb_url = ('http://archive.raspberrypi.org/debian/' > 'pool/main/r/raspberrypi-firmware/' > @@ -336,7 +337,7 @@ class BootLinuxConsole(Test): > dtb_path = self.extract_from_deb(deb_path, > '/boot/bcm2709-rpi-2-b.dtb') > > self.vm.set_machine('raspi2') > - self.vm.set_console() > + self.vm.set_console(console_id=uart_id) > kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + > serial_kernel_cmdline[uart_id]) > self.vm.add_args('-kernel', kernel_path, > @@ -354,6 +355,14 @@ class BootLinuxConsole(Test): > """ > self.do_test_arm_raspi2(0) > > + def test_arm_raspi2_uart1(self): > + """ > + :avocado: tags=arch:arm > + :avocado: tags=machine:raspi2 > + :avocado: tags=device:bcm2835_aux > + """ > + self.do_test_arm_raspi2(1) > + > def test_s390x_s390_ccw_virtio(self): > """ > :avocado: tags=arch:s390x -- Alex Bennée