diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2011-10-25 09:10:31 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-10-26 11:11:53 +0200 |
| commit | 40fcbc359e84dc92662324168ad97f83dbf031ed (patch) | |
| tree | 08939f78a56c08bd45862322eb1c7b5c4d1b5eeb | |
| parent | 6f5df8bcfe4c59997329c1ef8cdcf834894679a4 (diff) | |
qemu_sh4_r2d: update to fix serial console support
sh4-r2d has a serial port, however it's the second SH UART that's
emulated by Qemu so we need to adjust the kernel configuration for it to
see the relevant UART and adjust the qemu command line for it too.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | board/qemu/sh4-r2d/linux-3.1.config | 1 | ||||
| -rw-r--r-- | board/qemu/sh4-r2d/readme.txt | 6 | ||||
| -rw-r--r-- | configs/qemu_sh4_r2d_defconfig | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/board/qemu/sh4-r2d/linux-3.1.config b/board/qemu/sh4-r2d/linux-3.1.config index 638e4e031..287f36a65 100644 --- a/board/qemu/sh4-r2d/linux-3.1.config +++ b/board/qemu/sh4-r2d/linux-3.1.config @@ -48,7 +48,6 @@ CONFIG_INPUT_FF_MEMLESS=m CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=1 CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_SPI=y diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt index 76eafac5e..875e3d02f 100644 --- a/board/qemu/sh4-r2d/readme.txt +++ b/board/qemu/sh4-r2d/readme.txt @@ -1,5 +1,7 @@ Run the emulation with: - qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide -append "root=/dev/sda noiotrap" + qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide -append "root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio + +The login prompt will appear in the terminal that started Qemu. +The graphical window is the framebuffer. -The login prompt will appear in the graphical window. diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 32835decd..8f92a938c 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -4,7 +4,7 @@ BR2_sh4=y # system BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="tty1" +BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" # filesystem BR2_TARGET_ROOTFS_EXT2=y |