瀏覽代碼

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>
Gustavo Zacarias 13 年之前
父節點
當前提交
40fcbc359e
共有 3 個文件被更改,包括 5 次插入4 次删除
  1. 0 1
      board/qemu/sh4-r2d/linux-3.1.config
  2. 4 2
      board/qemu/sh4-r2d/readme.txt
  3. 1 1
      configs/qemu_sh4_r2d_defconfig

+ 0 - 1
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

+ 4 - 2
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.

+ 1 - 1
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