aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2011-10-24 16:42:13 -0300
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2011-10-25 12:31:07 +0200
commit1836d23386d8976a8b9b75b4ac02c5a40a4857f8 (patch)
treece7253981672a8283dc5235d7f8eb237708bec36 /board
parentd9944722c1bffdb65e1937bcda307d31e72dffee (diff)
downloadbuildroot-1836d23386d8976a8b9b75b4ac02c5a40a4857f8.tar.gz
buildroot-1836d23386d8976a8b9b75b4ac02c5a40a4857f8.tar.bz2
qemu_sh4_r2d: update to kernel 3.1 and update readme
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'board')
-rw-r--r--board/qemu/sh4-r2d/kernel-patches/linux-06-17-SH-Add-missing-consts-to-sys_execve-declaration.patch17
-rw-r--r--board/qemu/sh4-r2d/kernel-patches/linux-sh-fix-kconfig-warning.patch13
-rw-r--r--board/qemu/sh4-r2d/linux-3.1.config (renamed from board/qemu/sh4-r2d/linux-2.6.36.config)0
-rw-r--r--board/qemu/sh4-r2d/readme.txt18
4 files changed, 3 insertions, 45 deletions
diff --git a/board/qemu/sh4-r2d/kernel-patches/linux-06-17-SH-Add-missing-consts-to-sys_execve-declaration.patch b/board/qemu/sh4-r2d/kernel-patches/linux-06-17-SH-Add-missing-consts-to-sys_execve-declaration.patch
deleted file mode 100644
index f702abe042..0000000000
--- a/board/qemu/sh4-r2d/kernel-patches/linux-06-17-SH-Add-missing-consts-to-sys_execve-declaration.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h
-index be201fd..454538a 100644
---- a/arch/sh/include/asm/syscalls_32.h
-+++ b/arch/sh/include/asm/syscalls_32.h
-@@ -19,8 +19,10 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
- asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
- unsigned long r6, unsigned long r7,
- struct pt_regs __regs);
--asmlinkage int sys_execve(const char __user *ufilename, char __user * __user *uargv,
-- char __user * __user *uenvp, unsigned long r7,
-+asmlinkage int sys_execve(const char __user *ufilename,
-+ const char __user *const __user *uargv,
-+ const char __user *const __user *uenvp,
-+ unsigned long r7,
- struct pt_regs __regs);
- asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5,
- unsigned long r6, unsigned long r7,
diff --git a/board/qemu/sh4-r2d/kernel-patches/linux-sh-fix-kconfig-warning.patch b/board/qemu/sh4-r2d/kernel-patches/linux-sh-fix-kconfig-warning.patch
deleted file mode 100644
index 0ac07f2b66..0000000000
--- a/board/qemu/sh4-r2d/kernel-patches/linux-sh-fix-kconfig-warning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
-index 33990fa..06645b6 100644
---- a/arch/sh/Kconfig
-+++ b/arch/sh/Kconfig
-@@ -45,7 +45,7 @@ config SUPERH32
- select HAVE_ARCH_KGDB
- select HAVE_HW_BREAKPOINT
- select HAVE_MIXED_BREAKPOINTS_REGS
-- select PERF_EVENTS if HAVE_HW_BREAKPOINT
-+ select PERF_EVENTS
- select ARCH_HIBERNATION_POSSIBLE if MMU
-
- config SUPERH64
diff --git a/board/qemu/sh4-r2d/linux-2.6.36.config b/board/qemu/sh4-r2d/linux-3.1.config
index 638e4e031b..638e4e031b 100644
--- a/board/qemu/sh4-r2d/linux-2.6.36.config
+++ b/board/qemu/sh4-r2d/linux-3.1.config
diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index b237596eaa..76eafac5e9 100644
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -1,17 +1,5 @@
-This little documentation explains how to build a kernel and a rootfs
-for qemu with sh4 architecture.
+Run the emulation with:
-1) Select qemu sh4 configuration and compile it :
+ qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide -append "root=/dev/sda noiotrap"
-make sh4_defconfig
-make all
-
-2) Run qemu-system-sh4 with the kernel and rootfs previously generated
-
-It's recommended to use a git release for qemu (the current stable
-version has framebuffer display issues). If you want to avoid building
-all target, you can use this option on qemu configure :
---target-list=sh4-softmmu
-
-The command is :
-qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append root=/dev/sda console=ttySC1,115200 noiotrap
+The login prompt will appear in the graphical window.