diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
| commit | c3b72c6cd7b82e70cf61f4eac59f176444eaebf1 (patch) | |
| tree | fe27a5f40b77b826a0bbe7bc2587e4592f74e6c5 /board/qemu/x86 | |
| parent | c29253ef2e2a473e597637b7ada9fb268dfa8767 (diff) | |
| parent | e3c6b3853ef054efe3ab9800392aec7aa7656dd3 (diff) | |
| download | buildroot-novena-c3b72c6cd7b82e70cf61f4eac59f176444eaebf1.tar.gz buildroot-novena-c3b72c6cd7b82e70cf61f4eac59f176444eaebf1.zip | |
Merge branch 'next'
And kickoff 2012.02 cycle.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'board/qemu/x86')
| -rw-r--r-- | board/qemu/x86/linux-3.1.config (renamed from board/qemu/x86/linux-3.0.config) | 0 | ||||
| -rw-r--r-- | board/qemu/x86/readme.txt | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/board/qemu/x86/linux-3.0.config b/board/qemu/x86/linux-3.1.config index 5bf6944e3..5bf6944e3 100644 --- a/board/qemu/x86/linux-3.0.config +++ b/board/qemu/x86/linux-3.1.config diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt new file mode 100644 index 000000000..c06d24faa --- /dev/null +++ b/board/qemu/x86/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + + qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda + +The login prompt will appear in the graphical window. |