summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--board/qemu/arm-versatile/linux-3.1.config (renamed from board/qemu/arm-versatile/linux-2.6.38.config)0
-rw-r--r--board/qemu/arm-versatile/readme.txt6
-rw-r--r--configs/qemu_arm_versatile_defconfig4
3 files changed, 8 insertions, 2 deletions
diff --git a/board/qemu/arm-versatile/linux-2.6.38.config b/board/qemu/arm-versatile/linux-3.1.config
index 5f58b973a..5f58b973a 100644
--- a/board/qemu/arm-versatile/linux-2.6.38.config
+++ b/board/qemu/arm-versatile/linux-3.1.config
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
new file mode 100644
index 000000000..834b0e006
--- /dev/null
+++ b/board/qemu/arm-versatile/readme.txt
@@ -0,0 +1,6 @@
+Run the emulation with:
+
+ qemu-system-arm -M versatilepb -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=scsi -append "root=/dev/sda console=ttyAMA0,115200" -serial stdio
+
+The login prompt will appear in the terminal that started Qemu. The
+graphical window is the framebuffer.
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index e4a70245c..b629ba990 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-2.6.38.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.1.config"
BR2_LINUX_KERNEL_ZIMAGE=y