[kernel] r6680 - in dists/trunk/linux-2.6/debian: . patches/series

[Martin Michlmayr]

Author: tbm
Date: Wed May 24 13:23:04 2006
New Revision: 6680

Removed:
   dists/trunk/linux-2.6/debian/patches/mips-sb1-eth-1480.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/mips-arch-makefile.patch
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1

Log:
Update patches for 2.6.17.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed May 24 13:23:04 2006
@@ -1,7 +1,11 @@
 linux-2.6 (2.6.16+2.6.17-rc4-0experimental.1) UNRELEASED; urgency=low
 
+  [ Frederik Schüler ]
   * New upstream release candidate.
 
+  [ Martin Michlmayr ]
+  * [mips] Update patches for 2.6.17.
+
  -- Frederik Schüler <fs at debian.org>  Fri, 12 May 2006 13:02:25 +0200
 
 linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) experimental; urgency=low

Modified: dists/trunk/linux-2.6/debian/patches/mips-arch-makefile.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/mips-arch-makefile.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/mips-arch-makefile.patch	Wed May 24 13:23:04 2006
@@ -1,45 +1,22 @@
-## DP: Fix Makefile for compiles with modern toolchains.
+## DP: Add -mfix7000 to CONFIG_SGI_IP22
 ## DP: Patch author: Thiemo Seufer <ths at networkno.de>
-## DP: Upstream status: Thiemo will go through the Makefile and completely
-##     redo it.  Until this happens, this patch is needed for Debian.
+## DP: Upstream status: unclear
 
 From: Thiemo Seufer <ths at networkno.de>
 
-Fix Makefile for compiles with modern toolchains.
+Add -mfix7000 to CONFIG_SGI_IP22
 
 Signed-off-by: Thiemo Seufer <ths at networkno.de>
 Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
 
---
-
-diff -u -p -r1.186 Makefile
---- a/arch/mips/Makefile	18 Dec 2004 01:15:52 -0000	1.186
-+++ b/arch/mips/Makefile	10 Jan 2005 22:10:32 -0000
-@@ -118,7 +118,7 @@ if $(CC) $$gcc_abi -S -o /dev/null -xc /
- else \
- 	gcc_abi=; gcc_isa=-$(5); \
- fi; \
--gas_abi=-Wa,-$(gcc-abi); gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
-+gas_abi=-Wa,-mabi=$(gcc-abi); gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
- while :; do \
- 	for gas_opt in -Wa,-march= -Wa,-mcpu=; do \
- 		$(CC) $$gas_abi $$gas_opt$$cpu $$gas_isa -Wa,-Z -c \
-@@ -129,7 +129,7 @@ while :; do \
- 	break; \
- done; \
- if test "$(gcc-abi)" != "$(gas-abi)"; then \
--	gas_abi="-Wa,-$(gas-abi) -Wa,-mgp$(gcc-abi)"; \
-+	gas_abi="-Wa,-mabi=$(gas-abi) -Wa,-mgp$(gcc-abi)"; \
- fi; \
- if test "$$gcc_opt" = -march= && test -n "$$gcc_abi"; then \
- 	$(CC) $$gcc_abi $$gcc_opt$$gcc_cpu -S -o /dev/null \
-@@ -581,7 +597,7 @@ endif
- # will break.
- #
- core-$(CONFIG_SGI_IP32)		+= arch/mips/sgi-ip32/
--cflags-$(CONFIG_SGI_IP32)	+= -Iinclude/asm-mips/mach-ip32
-+cflags-$(CONFIG_SGI_IP32)	+= -Iinclude/asm-mips/mach-ip32 -Wa,-mfix7000
- load-$(CONFIG_SGI_IP32)		+= 0xffffffff80004000
- 
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -478,7 +478,7 @@ load-$(CONFIG_PNX8550_JBS)	+= 0xffffffff
+ # address by 8kb.
  #
-
+ core-$(CONFIG_SGI_IP22)		+= arch/mips/sgi-ip22/
+-cflags-$(CONFIG_SGI_IP22)	+= -Iinclude/asm-mips/mach-ip22
++cflags-$(CONFIG_SGI_IP22)	+= -Iinclude/asm-mips/mach-ip22 -Wa,-mfix7000
+ ifdef CONFIG_32BIT
+ load-$(CONFIG_SGI_IP22)		+= 0xffffffff88002000
+ endif

Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1	Wed May 24 13:23:04 2006
@@ -11,12 +11,10 @@
 + powerpc-mv643xx-hotplug-support.patch
 + sparc64-hme-lockup.patch
 + sparc64-atyfb-xl-gr.patch
-#FIXME + mips-makefile.patch
-#FIXME + mips-arch-makefile.patch
++ mips-arch-makefile.patch
 + mips-gettimeofday.patch
 + mips-ide-scan.patch
-#FIXME + mips-sb1-probe-ide.patch
-#FIXME + mips-sb1-eth-1480.patch
++ mips-sb1-probe-ide.patch
 + mips-sb1-eth-napi.patch
 + mips-sb1-duart.patch
 + video-vino-64-bit-fix-kernel.diff