r1008 - in trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8: debian patches
Sven Luther
luther@haydn.debian.org
Wed, 11 Aug 2004 08:19:28 -0600
Author: luther
Date: 2004-08-11 08:19:07 -0600 (Wed, 11 Aug 2004)
New Revision: 1008
Removed:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/binutils.diff
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/uhci.diff
Modified:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
Log:
Removal of uhci.diff and binutils.diff.
Added 2.6.8 entries in control and changelogs.
Added myself to the uploaders.
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog 2004-08-11 14:12:07 UTC (rev 1007)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog 2004-08-11 14:19:07 UTC (rev 1008)
@@ -1,3 +1,12 @@
+kernel-patch-powerpc-2.6.8 (2.6.8-0.1) unstable; urgency=low
+
+ * Tentative package for the -rc4 kernel-sources.
+ * Removed binutils.diff patch since it was a backport (Sven Luther).
+ * Removed uhci.diff, it is superceded by the g4-errata fix now in upstream
+ (Sven Luther).
+
+ -- Sven Luther <luther@debian.org> Wed, 11 Aug 2004 16:10:36 +0200
+
kernel-patch-powerpc-2.6.7 (2.6.7-5) unstable; urgency=high
* Enabled psaux compatiblity driver, since not having it will break
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control 2004-08-11 14:12:07 UTC (rev 1007)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control 2004-08-11 14:19:07 UTC (rev 1008)
@@ -1,14 +1,14 @@
-Source: kernel-patch-powerpc-2.6.7
+Source: kernel-patch-powerpc-2.6.8
Section: devel
Priority: optional
-Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.7, m4
+Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.8, m4
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-Uploaders: Jens Schmalzing <jensen@debian.org>
+Uploaders: Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>
Standards-Version: 3.6.1
-Package: kernel-patch-powerpc-2.6.7
+Package: kernel-patch-powerpc-2.6.8
Architecture: all
-Suggests: kernel-tree-2.6.7
+Suggests: kernel-tree-2.6.8
Description: improved PowerPC support for the Linux kernel
.
This package collects a number of patches that improve the Linux
@@ -16,125 +16,125 @@
mainly used to build the official Debian kernel packages, but you
can also use it as a starting point for custom-built kernels.
-Package: kernel-headers-2.6.7
+Package: kernel-headers-2.6.8
Architecture: powerpc
-Description: header files for the Linux kernel version 2.6.7
+Description: header files for the Linux kernel version 2.6.8
.
- This package provides kernel headers files for 2.6.7.
+ This package provides kernel headers files for 2.6.8.
Package: kernel-image-power3
Section: base
Architecture: powerpc
-Depends: kernel-image-2.6.7-power3
+Depends: kernel-image-2.6.8-power3
Description: Linux kernel image for power3
.
This is a dummy package that will always depend on the latest release
of the kernel-image package for power3.
-Package: kernel-build-2.6.7-power3
+Package: kernel-build-2.6.8-power3
Architecture: powerpc
-Depends: kernel-headers-2.6.7
-Description: build infrastructure for kernel version 2.6.7-power3
+Depends: kernel-headers-2.6.8
+Description: build infrastructure for kernel version 2.6.8-power3
.
- Together with kernel-headers-2.6.7, this package provides the
- infrastructure for building additional modules for 2.6.7-power3.
+ Together with kernel-headers-2.6.8, this package provides the
+ infrastructure for building additional modules for 2.6.8-power3.
-Package: kernel-image-2.6.7-power3
+Package: kernel-image-2.6.8-power3
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.7-power3
+Description: Linux kernel image for 2.6.8-power3
.
- This package contains the Linux kernel for version 2.6.7-power3.
+ This package contains the Linux kernel for version 2.6.8-power3.
It is intended to be run on PowerPC machines with a single Power3
processor.
Package: kernel-image-power3-smp
Section: base
Architecture: powerpc
-Depends: kernel-image-2.6.7-power3-smp
+Depends: kernel-image-2.6.8-power3-smp
Description: Linux kernel image for power3-smp
.
This is a dummy package that will always depend on the latest release
of the kernel-image package for power3-smp.
-Package: kernel-build-2.6.7-power3-smp
+Package: kernel-build-2.6.8-power3-smp
Architecture: powerpc
-Depends: kernel-headers-2.6.7
-Description: build infrastructure for kernel version 2.6.7-power3-smp
+Depends: kernel-headers-2.6.8
+Description: build infrastructure for kernel version 2.6.8-power3-smp
.
- Together with kernel-headers-2.6.7, this package provides the
- infrastructure for building additional modules for 2.6.7-power3-smp.
+ Together with kernel-headers-2.6.8, this package provides the
+ infrastructure for building additional modules for 2.6.8-power3-smp.
-Package: kernel-image-2.6.7-power3-smp
+Package: kernel-image-2.6.8-power3-smp
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.7-power3-smp
+Description: Linux kernel image for 2.6.8-power3-smp
.
- This package contains the Linux kernel for version 2.6.7-power3-smp.
+ This package contains the Linux kernel for version 2.6.8-power3-smp.
It is intended to be run on PowerPC machines with two or more
Power3 processors, like some IBM RS/6000 boxen.
Package: kernel-image-power4
Section: base
Architecture: powerpc
-Depends: kernel-image-2.6.7-power4
+Depends: kernel-image-2.6.8-power4
Description: Linux kernel image for power4
.
This is a dummy package that will always depend on the latest release
of the kernel-image package for power4.
-Package: kernel-build-2.6.7-power4
+Package: kernel-build-2.6.8-power4
Architecture: powerpc
-Depends: kernel-headers-2.6.7
-Description: build infrastructure for kernel version 2.6.7-power4
+Depends: kernel-headers-2.6.8
+Description: build infrastructure for kernel version 2.6.8-power4
.
- Together with kernel-headers-2.6.7, this package provides the
- infrastructure for building additional modules for 2.6.7-power4.
+ Together with kernel-headers-2.6.8, this package provides the
+ infrastructure for building additional modules for 2.6.8-power4.
-Package: kernel-image-2.6.7-power4
+Package: kernel-image-2.6.8-power4
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.7-power4
+Description: Linux kernel image for 2.6.8-power4
.
- This package contains the Linux kernel for version 2.6.7-power4.
+ This package contains the Linux kernel for version 2.6.8-power4.
It is intended to be run on PowerPC machines with a single Power4
processor, the most prominent example being the G5 PowerMac by Apple.
Package: kernel-image-power4-smp
Section: base
Architecture: powerpc
-Depends: kernel-image-2.6.7-power4-smp
+Depends: kernel-image-2.6.8-power4-smp
Description: Linux kernel image for power4-smp
.
This is a dummy package that will always depend on the latest release
of the kernel-image package for power4-smp.
-Package: kernel-build-2.6.7-power4-smp
+Package: kernel-build-2.6.8-power4-smp
Architecture: powerpc
-Depends: kernel-headers-2.6.7
-Description: build infrastructure for kernel version 2.6.7-power4-smp
+Depends: kernel-headers-2.6.8
+Description: build infrastructure for kernel version 2.6.8-power4-smp
.
- Together with kernel-headers-2.6.7, this package provides the
- infrastructure for building additional modules for 2.6.7-power4-smp.
+ Together with kernel-headers-2.6.8, this package provides the
+ infrastructure for building additional modules for 2.6.8-power4-smp.
-Package: kernel-image-2.6.7-power4-smp
+Package: kernel-image-2.6.8-power4-smp
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.7-power4-smp
+Description: Linux kernel image for 2.6.8-power4-smp
.
- This package contains the Linux kernel for version 2.6.7-power4-smp.
+ This package contains the Linux kernel for version 2.6.8-power4-smp.
It is intended to be run on PowerPC machines with two or more Power4
processors. This setup can be found in Apple's dual G5 PowerMacs, as
well as in a number of IBM RS/6000 boxen, such as the iSeries and
@@ -143,57 +143,57 @@
Package: kernel-image-powerpc
Section: base
Architecture: powerpc
-Depends: kernel-image-2.6.7-powerpc
+Depends: kernel-image-2.6.8-powerpc
Description: Linux kernel image for powerpc
.
This is a dummy package that will always depend on the latest release
of the kernel-image package for powerpc.
-Package: kernel-build-2.6.7-powerpc
+Package: kernel-build-2.6.8-powerpc
Architecture: powerpc
-Depends: kernel-headers-2.6.7
-Description: build infrastructure for kernel version 2.6.7-powerpc
+Depends: kernel-headers-2.6.8
+Description: build infrastructure for kernel version 2.6.8-powerpc
.
- Together with kernel-headers-2.6.7, this package provides the
- infrastructure for building additional modules for 2.6.7-powerpc.
+ Together with kernel-headers-2.6.8, this package provides the
+ infrastructure for building additional modules for 2.6.8-powerpc.
-Package: kernel-image-2.6.7-powerpc
+Package: kernel-image-2.6.8-powerpc
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.7-powerpc
+Description: Linux kernel image for 2.6.8-powerpc
.
- This package contains the Linux kernel for version 2.6.7-powerpc.
+ This package contains the Linux kernel for version 2.6.8-powerpc.
It is intended to be run on single-processor PowerPC machines,
including all G3 and G4 models by Apple, as well as older PowerMacs.
Package: kernel-image-powerpc-smp
Section: base
Architecture: powerpc
-Depends: kernel-image-2.6.7-powerpc-smp
+Depends: kernel-image-2.6.8-powerpc-smp
Description: Linux kernel image for powerpc-smp
.
This is a dummy package that will always depend on the latest release
of the kernel-image package for powerpc-smp.
-Package: kernel-build-2.6.7-powerpc-smp
+Package: kernel-build-2.6.8-powerpc-smp
Architecture: powerpc
-Depends: kernel-headers-2.6.7
-Description: build infrastructure for kernel version 2.6.7-powerpc-smp
+Depends: kernel-headers-2.6.8
+Description: build infrastructure for kernel version 2.6.8-powerpc-smp
.
- Together with kernel-headers-2.6.7, this package provides the
- infrastructure for building additional modules for 2.6.7-powerpc-smp.
+ Together with kernel-headers-2.6.8, this package provides the
+ infrastructure for building additional modules for 2.6.8-powerpc-smp.
-Package: kernel-image-2.6.7-powerpc-smp
+Package: kernel-image-2.6.8-powerpc-smp
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.7-powerpc-smp
+Description: Linux kernel image for 2.6.8-powerpc-smp
.
- This package contains the Linux kernel for version 2.6.7-powerpc-smp.
+ This package contains the Linux kernel for version 2.6.8-powerpc-smp.
It is intended to be run on most dual-processor PowerPC machines,
most notably the Dual G4 PowerMacs by Apple.
Deleted: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/binutils.diff
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/binutils.diff 2004-08-11 14:12:07 UTC (rev 1007)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/binutils.diff 2004-08-11 14:19:07 UTC (rev 1008)
@@ -1,91 +0,0 @@
-diff -Nur kernel-source-2.6.7.orig/arch/ppc/Makefile kernel-source-2.6.7/arch/ppc/Makefile
---- kernel-source-2.6.7.orig/arch/ppc/Makefile 2004-06-16 07:18:57.000000000 +0200
-+++ kernel-source-2.6.7/arch/ppc/Makefile 2004-08-05 21:11:02.802425545 +0200
-@@ -16,14 +16,18 @@
- LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic
- CPPFLAGS += -Iarch/$(ARCH)
- AFLAGS += -Iarch/$(ARCH)
--cflags-y += -Iarch/$(ARCH) -msoft-float -pipe \
-+CFLAGS += -Iarch/$(ARCH) -msoft-float -pipe \
- -ffixed-r2 -Wno-uninitialized -mmultiple -mstring
- CPP = $(CC) -E $(CFLAGS)
-
--cflags-$(CONFIG_4xx) += -Wa,-m405
--cflags-$(CONFIG_PPC64BRIDGE) += -Wa,-mppc64bridge
-+cpu-as-$(CONFIG_4xx) += -Wa,-m405
-+cpu-as-$(CONFIG_6xx) += -Wa,-maltivec
-+cpu-as-$(CONFIG_E500) += -Wa,-me500
-+cpu-as-$(CONFIG_PPC64BRIDGE) += -Wa,-mppc64bridge
-+cpu-as-$(CONFIG_POWER4) += -Wa,-maltivec
-
--CFLAGS += $(cflags-y)
-+AFLAGS += $(cpu-as-y)
-+CFLAGS += $(cpu-as-y)
-
-
- head-y := arch/ppc/kernel/head.o
-diff -Nur kernel-source-2.6.7.orig/arch/ppc/kernel/Makefile kernel-source-2.6.7/arch/ppc/kernel/Makefile
---- kernel-source-2.6.7.orig/arch/ppc/kernel/Makefile 2004-06-16 07:19:53.000000000 +0200
-+++ kernel-source-2.6.7/arch/ppc/kernel/Makefile 2004-08-05 21:11:20.616071975 +0200
-@@ -2,13 +2,6 @@
- # Makefile for the linux kernel.
- #
-
--ifdef CONFIG_PPC64BRIDGE
--EXTRA_AFLAGS := -Wa,-mppc64bridge
--endif
--ifdef CONFIG_4xx
--EXTRA_AFLAGS := -Wa,-m405
--endif
--
- extra-$(CONFIG_PPC_STD_MMU) := head.o
- extra-$(CONFIG_40x) := head_4xx.o
- extra-$(CONFIG_44x) := head_44x.o
-diff -Nur kernel-source-2.6.7.orig/arch/ppc/mm/Makefile kernel-source-2.6.7/arch/ppc/mm/Makefile
---- kernel-source-2.6.7.orig/arch/ppc/mm/Makefile 2004-06-16 07:19:51.000000000 +0200
-+++ kernel-source-2.6.7/arch/ppc/mm/Makefile 2004-08-05 21:11:31.592854105 +0200
-@@ -2,10 +2,6 @@
- # Makefile for the linux ppc-specific parts of the memory manager.
- #
-
--ifdef CONFIG_PPC64BRIDGE
--EXTRA_AFLAGS := -Wa,-mppc64bridge
--endif
--
- obj-y := fault.o init.o mem_pieces.o \
- mmu_context.o pgtable.o
-
-diff -Nur kernel-source-2.6.7.orig/arch/ppc/platforms/Makefile kernel-source-2.6.7/arch/ppc/platforms/Makefile
---- kernel-source-2.6.7.orig/arch/ppc/platforms/Makefile 2004-06-16 07:20:26.000000000 +0200
-+++ kernel-source-2.6.7/arch/ppc/platforms/Makefile 2004-08-05 21:11:46.598556267 +0200
-@@ -2,13 +2,6 @@
- # Makefile for the linux kernel.
- #
-
--ifdef CONFIG_PPC64BRIDGE
--EXTRA_AFLAGS := -Wa,-mppc64bridge
--endif
--ifdef CONFIG_40x
--EXTRA_AFLAGS := -Wa,-m405
--endif
--
- # Extra CFLAGS so we don't have to do relative includes
- CFLAGS_pmac_setup.o += -Iarch/$(ARCH)/mm
-
-diff -Nur kernel-source-2.6.7.orig/arch/ppc/syslib/Makefile kernel-source-2.6.7/arch/ppc/syslib/Makefile
---- kernel-source-2.6.7.orig/arch/ppc/syslib/Makefile 2004-06-16 07:18:57.000000000 +0200
-+++ kernel-source-2.6.7/arch/ppc/syslib/Makefile 2004-08-05 21:11:55.276384027 +0200
-@@ -2,13 +2,6 @@
- # Makefile for the linux kernel.
- #
-
--ifdef CONFIG_PPC64BRIDGE
--EXTRA_AFLAGS := -Wa,-mppc64bridge
--endif
--ifdef CONFIG_4xx
--EXTRA_AFLAGS := -Wa,-m405
--endif
--
- CFLAGS_prom_init.o += -fPIC
- CFLAGS_btext.o += -fPIC
-
Deleted: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/uhci.diff
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/uhci.diff 2004-08-11 14:12:07 UTC (rev 1007)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/uhci.diff 2004-08-11 14:19:07 UTC (rev 1008)
@@ -1,71 +0,0 @@
-diff -urN kernel-source-2.6.7.orig/drivers/usb/host/uhci-hcd.c kernel-source-2.6.7/drivers/usb/host/uhci-hcd.c
---- kernel-source-2.6.7.orig/drivers/usb/host/uhci-hcd.c 2004-06-16 07:19:53.000000000 +0200
-+++ kernel-source-2.6.7/drivers/usb/host/uhci-hcd.c 2004-06-22 19:08:45.813196632 +0200
-@@ -2139,14 +2139,14 @@
- uhci->fl->dma_handle = dma_handle;
-
- uhci->td_pool = dma_pool_create("uhci_td", uhci_dev(uhci),
-- sizeof(struct uhci_td), 16, 0);
-+ sizeof(struct uhci_td), UHCI_ALIGN, 0);
- if (!uhci->td_pool) {
- dev_err(uhci_dev(uhci), "unable to create td dma_pool\n");
- goto err_create_td_pool;
- }
-
- uhci->qh_pool = dma_pool_create("uhci_qh", uhci_dev(uhci),
-- sizeof(struct uhci_qh), 16, 0);
-+ sizeof(struct uhci_qh), UHCI_ALIGN, 0);
- if (!uhci->qh_pool) {
- dev_err(uhci_dev(uhci), "unable to create qh dma_pool\n");
- goto err_create_qh_pool;
-diff -urN kernel-source-2.6.7.orig/drivers/usb/host/uhci-hcd.h kernel-source-2.6.7/drivers/usb/host/uhci-hcd.h
---- kernel-source-2.6.7.orig/drivers/usb/host/uhci-hcd.h 2004-06-16 07:19:44.000000000 +0200
-+++ kernel-source-2.6.7/drivers/usb/host/uhci-hcd.h 2004-06-22 19:08:06.838121744 +0200
-@@ -7,6 +7,12 @@
- #define usb_packetid(pipe) (usb_pipein(pipe) ? USB_PID_IN : USB_PID_OUT)
- #define PIPE_DEVEP_MASK 0x0007ff00
-
-+#if L1_CACHE_LINE_SIZE > 16
-+#define UHCI_ALIGN L1_CACHE_LINE_SIZE
-+#else
-+#define UHCI_ALIGN 16
-+#endif
-+
- /*
- * Universal Host Controller Interface data structures and defines
- */
-@@ -109,14 +115,14 @@
- u32 element; /* Queue element pointer */
-
- /* Software fields */
-- dma_addr_t dma_handle;
-+ dma_addr_t dma_handle __attribute__((aligned( UHCI_ALIGN )));
-
- struct usb_device *dev;
- struct urb_priv *urbp;
-
- struct list_head list; /* P: uhci->frame_list_lock */
- struct list_head remove_list; /* P: uhci->remove_list_lock */
--} __attribute__((aligned(16)));
-+} __attribute__((aligned( UHCI_ALIGN )));
-
- /*
- * for TD <status>:
-@@ -191,7 +197,7 @@
- u32 buffer;
-
- /* Software fields */
-- dma_addr_t dma_handle;
-+ dma_addr_t dma_handle __attribute__((aligned( UHCI_ALIGN )));
-
- struct usb_device *dev;
- struct urb *urb;
-@@ -201,7 +207,7 @@
-
- int frame; /* for iso: what frame? */
- struct list_head fl_list; /* P: uhci->frame_list_lock */
--} __attribute__((aligned(16)));
-+} __attribute__((aligned( UHCI_ALIGN )));
-
- /*
- * The UHCI driver places Interrupt, Control and Bulk into QH's both