From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 7 Jun 2006 23:46:57 +0000 (+0000)
Subject: move mips boot patch to generic-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eb1b6f7636681b37b6670d3fd7fc179cadb38cbe;p=openwrt%2Fstaging%2Fsvanheule.git

move mips boot patch to generic-2.6

SVN-Revision: 3909
---

diff --git a/openwrt/target/linux/aruba-2.6/patches/007-boot.patch b/openwrt/target/linux/aruba-2.6/patches/007-boot.patch
deleted file mode 100644
index 611c70d460..0000000000
--- a/openwrt/target/linux/aruba-2.6/patches/007-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/openwrt/target/linux/au1000-2.6/patches/009-boot.patch b/openwrt/target/linux/au1000-2.6/patches/009-boot.patch
deleted file mode 100644
index 611c70d460..0000000000
--- a/openwrt/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/openwrt/target/linux/brcm-2.6/patches/001-bcm947xx.patch b/openwrt/target/linux/brcm-2.6/patches/001-bcm947xx.patch
index 771ea71b7f..c6f63a2b8a 100644
--- a/openwrt/target/linux/brcm-2.6/patches/001-bcm947xx.patch
+++ b/openwrt/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
  
@@ -11815,9 +11815,6 @@ diff -Nur linux-2.6.16/arch/mips/kernel/head.S linux-2.6.16-owrt/arch/mips/kerne
 +#undef eret
 +#define eret nop; nop; eret
 +#endif
-+
-+	j	kernel_entry
-+	nop
 +
  	/*
  	 * Reserved space for exception handlers.
diff --git a/openwrt/target/linux/generic-2.6/patches/011-mips_boot.patch b/openwrt/target/linux/generic-2.6/patches/011-mips_boot.patch
new file mode 100644
index 0000000000..611c70d460
--- /dev/null
+++ b/openwrt/target/linux/generic-2.6/patches/011-mips_boot.patch
@@ -0,0 +1,15 @@
+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.
+