diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-06-07 23:46:57 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-06-07 23:46:57 +0000 |
| commit | 41fdecb111a35a94f65df559eaa363947e5f4e10 (patch) | |
| tree | 7d69f6297c2a5b7833bd085d79e7708507847bfa | |
| parent | 0d2d5b055d824a8eb822f29181aed5435fc3c045 (diff) | |
move mips boot patch to generic-2.6
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3909 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/au1000-2.6/patches/009-boot.patch | 15 | ||||
| -rw-r--r-- | target/linux/brcm-2.6/patches/001-bcm947xx.patch | 5 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches/011-mips_boot.patch (renamed from target/linux/aruba-2.6/patches/007-boot.patch) | 0 |
3 files changed, 1 insertions, 19 deletions
diff --git a/target/linux/au1000-2.6/patches/009-boot.patch b/target/linux/au1000-2.6/patches/009-boot.patch deleted file mode 100644 index 611c70d460..0000000000 --- a/target/linux/au1000-2.6/patches/009-boot.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur linux-cvs/arch/mips/kernel/head.S linux-aruba/arch/mips/kernel/head.S ---- linux-cvs/arch/mips/kernel/head.S 2004-12-23 00:21:39.000000000 -0800 -+++ linux-aruba/arch/mips/kernel/head.S 2005-10-20 09:16:08.000000000 -0700 -@@ -122,6 +122,10 @@ - #endif - .endm - -+ -+ j kernel_entry -+ nop -+ - /* - * Reserved space for exception handlers. - * Necessary for machines which link their kernels at KSEG0. - diff --git a/target/linux/brcm-2.6/patches/001-bcm947xx.patch b/target/linux/brcm-2.6/patches/001-bcm947xx.patch index 771ea71b7f..c6f63a2b8a 100644 --- a/target/linux/brcm-2.6/patches/001-bcm947xx.patch +++ b/target/linux/brcm-2.6/patches/001-bcm947xx.patch @@ -11807,7 +11807,7 @@ diff -Nur linux-2.6.16/arch/mips/kernel/cpu-probe.c linux-2.6.16-owrt/arch/mips/ diff -Nur linux-2.6.16/arch/mips/kernel/head.S linux-2.6.16-owrt/arch/mips/kernel/head.S --- linux-2.6.16/arch/mips/kernel/head.S 2006-03-20 06:53:29.000000000 +0100 +++ linux-2.6.16-owrt/arch/mips/kernel/head.S 2006-03-21 09:31:00.000000000 +0100 -@@ -107,6 +107,14 @@ +@@ -107,6 +107,11 @@ #endif .endm @@ -11816,9 +11816,6 @@ diff -Nur linux-2.6.16/arch/mips/kernel/head.S linux-2.6.16-owrt/arch/mips/kerne +#define eret nop; nop; eret +#endif + -+ j kernel_entry -+ nop -+ /* * Reserved space for exception handlers. * Necessary for machines which link their kernels at KSEG0. diff --git a/target/linux/aruba-2.6/patches/007-boot.patch b/target/linux/generic-2.6/patches/011-mips_boot.patch index 611c70d460..611c70d460 100644 --- a/target/linux/aruba-2.6/patches/007-boot.patch +++ b/target/linux/generic-2.6/patches/011-mips_boot.patch |