Author: jim
Date: 2005-11-05 01:32:33 -0700 (Sat, 05 Nov 2005)
New Revision: 1242
Modified:
trunk/
trunk/linux/linux-2.6.14-mips_fix-1.patch
Log:
[EMAIL PROTECTED]: jim | 2005-11-05 00:31:34 -0800
Updated mips patch for 2.6.14 linux
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1477
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1479
Modified: trunk/linux/linux-2.6.14-mips_fix-1.patch
===================================================================
--- trunk/linux/linux-2.6.14-mips_fix-1.patch 2005-11-04 21:41:35 UTC (rev
1241)
+++ trunk/linux/linux-2.6.14-mips_fix-1.patch 2005-11-05 08:32:33 UTC (rev
1242)
@@ -73453,13 +73453,6 @@
}
-
-early_initcall(nec_cmbvr4133_setup);
-diff -Naur linux-2.6.14.orig/drivers/char/.gitignore
linux-2.6.14/drivers/char/.gitignore
---- linux-2.6.14.orig/drivers/char/.gitignore 2005-10-28 00:02:08.000000000
+0000
-+++ linux-2.6.14/drivers/char/.gitignore 1970-01-01 00:00:00.000000000
+0000
-@@ -1,3 +0,0 @@
--consolemap_deftbl.c
--defkeymap.c
--
diff -Naur linux-2.6.14.orig/drivers/char/Kconfig
linux-2.6.14/drivers/char/Kconfig
--- linux-2.6.14.orig/drivers/char/Kconfig 2005-10-28 00:02:08.000000000
+0000
+++ linux-2.6.14/drivers/char/Kconfig 2005-11-03 05:28:47.000000000 +0000
@@ -99629,14 +99622,6 @@
HAS_MII | HAS_MEDIA_TABLE | ALWAYS_CHECK_MII | HAS_ACPI | HAS_NWAY
| HAS_INTR_MITIGATION | HAS_PCI_MWI, t21142_timer },
-diff -Naur linux-2.6.14.orig/drivers/pci/.gitignore
linux-2.6.14/drivers/pci/.gitignore
---- linux-2.6.14.orig/drivers/pci/.gitignore 2005-10-28 00:02:08.000000000
+0000
-+++ linux-2.6.14/drivers/pci/.gitignore 1970-01-01 00:00:00.000000000
+0000
-@@ -1,4 +0,0 @@
--classlist.h
--devlist.h
--gen-devlist
--
diff -Naur linux-2.6.14.orig/drivers/pci/pci.ids
linux-2.6.14/drivers/pci/pci.ids
--- linux-2.6.14.orig/drivers/pci/pci.ids 1970-01-01 00:00:00.000000000
+0000
+++ linux-2.6.14/drivers/pci/pci.ids 2005-11-03 05:29:26.000000000 +0000
@@ -122584,17 +122569,6 @@
/* map framebuffer memory into tiles table */
for (i = 0; i < (gbe_mem_size >> TILE_SHIFT); i++)
gbe_tiles.cpu[i] = (gbe_mem_phys >> TILE_SHIFT) + i;
-diff -Naur linux-2.6.14.orig/drivers/video/logo/.gitignore
linux-2.6.14/drivers/video/logo/.gitignore
---- linux-2.6.14.orig/drivers/video/logo/.gitignore 2005-10-28
00:02:08.000000000 +0000
-+++ linux-2.6.14/drivers/video/logo/.gitignore 1970-01-01 00:00:00.000000000
+0000
-@@ -1,7 +0,0 @@
--#
--# Generated files
--#
--*_mono.c
--*_vga16.c
--*_clut224.c
--*_gray256.c
diff -Naur linux-2.6.14.orig/drivers/video/smivgxfb.c
linux-2.6.14/drivers/video/smivgxfb.c
--- linux-2.6.14.orig/drivers/video/smivgxfb.c 1970-01-01 00:00:00.000000000
+0000
+++ linux-2.6.14/drivers/video/smivgxfb.c 2005-11-03 05:29:51.000000000
+0000
@@ -126040,7 +126014,7 @@
#endif /* __ASM_INVENTORY_H */
diff -Naur linux-2.6.14.orig/include/asm-mips/io.h
linux-2.6.14/include/asm-mips/io.h
--- linux-2.6.14.orig/include/asm-mips/io.h 2005-10-28 00:02:08.000000000
+0000
-+++ linux-2.6.14/include/asm-mips/io.h 2005-11-03 05:30:16.000000000 +0000
++++ linux-2.6.14/include/asm-mips/io.h 2005-11-05 08:04:04.000000000 +0000
@@ -25,7 +25,9 @@
#include <asm/page.h>
#include <asm/pgtable-bits.h>
@@ -126342,25 +126316,25 @@
__addr++; \
} \
}
-@@ -470,43 +513,26 @@
+@@ -470,34 +513,28 @@
BUILDSTRING(b, u8)
BUILDSTRING(w, u16)
BUILDSTRING(l, u32)
+#ifdef CONFIG_64BIT
BUILDSTRING(q, u64)
-+#endif
-
-
- /* Depends on MIPS II instruction set */
- #define mmiowb() asm volatile ("sync" ::: "memory")
-
+-
+-
+-/* Depends on MIPS II instruction set */
+-#define mmiowb() asm volatile ("sync" ::: "memory")
+-
-#define memset_io(a,b,c) memset((void *)(a),(b),(c))
-#define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c))
-#define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c))
--
--/*
-- * Memory Mapped I/O
-- */
++#endif
+
+ /*
+ * Memory Mapped I/O
+ */
-#define ioread8(addr) readb(addr)
-#define ioread16(addr) readw(addr)
-#define ioread32(addr) readl(addr)
@@ -126376,15 +126350,31 @@
-#define iowrite8_rep(a,b,c) writesb(a,b,c)
-#define iowrite16_rep(a,b,c) writesw(a,b,c)
-#define iowrite32_rep(a,b,c) writesl(a,b,c)
--
--/* Create a virtual mapping cookie for an IO port range */
--extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
--extern void ioport_unmap(void __iomem *);
--
--/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
--struct pci_dev;
--extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long
max);
--extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
++#define ioread8(addr) readb(addr)
++#define ioread16(addr) readw(addr)
++#define ioread32(addr) readl(addr)
++
++#define iowrite8(b,addr) writeb(b,addr)
++#define iowrite16(w,addr) writew(w,addr)
++#define iowrite32(l,addr) writel(l,addr)
++
++#define ioread8_rep(a,b,c) readsb(a,b,c)
++#define ioread16_rep(a,b,c) readsw(a,b,c)
++#define ioread32_rep(a,b,c) readsl(a,b,c)
++
++#define iowrite8_rep(a,b,c) writesb(a,b,c)
++#define iowrite16_rep(a,b,c) writesw(a,b,c)
++#define iowrite32_rep(a,b,c) writesl(a,b,c)
+
+ /* Create a virtual mapping cookie for an IO port range */
+ extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
+@@ -508,6 +545,22 @@
+ extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long
max);
+ extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
+
++/* Depends on MIPS II instruction set */
++#define mmiowb() asm volatile ("sync" ::: "memory")
++
+static inline void memset_io(volatile void __iomem *addr, unsigned char val,
int count)
+{
+ memset((void __force *) addr, val, count);
@@ -126397,9 +126387,10 @@
+{
+ memcpy((void __force *) dst, src, count);
+}
-
++
/*
* ISA space is 'always mapped' on currently supported MIPS systems, no need
+ * to explicitly ioremap() it. The fact that the ISA IO space is mapped
diff -Naur linux-2.6.14.orig/include/asm-mips/ip32/mace.h
linux-2.6.14/include/asm-mips/ip32/mace.h
--- linux-2.6.14.orig/include/asm-mips/ip32/mace.h 2005-10-28
00:02:08.000000000 +0000
+++ linux-2.6.14/include/asm-mips/ip32/mace.h 2005-11-03 05:30:16.000000000
+0000
@@ -139569,59 +139560,6 @@
+#define ip3106_mid(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFFC)
+
+#endif
-diff -Naur linux-2.6.14.orig/lib/.gitignore linux-2.6.14/lib/.gitignore
---- linux-2.6.14.orig/lib/.gitignore 2005-10-28 00:02:08.000000000 +0000
-+++ linux-2.6.14/lib/.gitignore 1970-01-01 00:00:00.000000000 +0000
-@@ -1,6 +0,0 @@
--#
--# Generated files
--#
--gen_crc32table
--crc32table.h
--
-diff -Naur linux-2.6.14.orig/scripts/.gitignore linux-2.6.14/scripts/.gitignore
---- linux-2.6.14.orig/scripts/.gitignore 2005-10-28 00:02:08.000000000
+0000
-+++ linux-2.6.14/scripts/.gitignore 1970-01-01 00:00:00.000000000 +0000
-@@ -1,4 +0,0 @@
--conmakehash
--kallsyms
--pnmtologo
--
-diff -Naur linux-2.6.14.orig/scripts/basic/.gitignore
linux-2.6.14/scripts/basic/.gitignore
---- linux-2.6.14.orig/scripts/basic/.gitignore 2005-10-28 00:02:08.000000000
+0000
-+++ linux-2.6.14/scripts/basic/.gitignore 1970-01-01 00:00:00.000000000
+0000
-@@ -1,3 +0,0 @@
--fixdep
--split-include
--docproc
-diff -Naur linux-2.6.14.orig/scripts/kconfig/.gitignore
linux-2.6.14/scripts/kconfig/.gitignore
---- linux-2.6.14.orig/scripts/kconfig/.gitignore 2005-10-28
00:02:08.000000000 +0000
-+++ linux-2.6.14/scripts/kconfig/.gitignore 1970-01-01 00:00:00.000000000
+0000
-@@ -1,16 +0,0 @@
--#
--# Generated files
--#
--config*
--lex.*.c
--*.tab.c
--*.tab.h
--
--#
--# configuration programs
--#
--conf
--mconf
--qconf
--gconf
--kxgettext
-diff -Naur linux-2.6.14.orig/scripts/mod/.gitignore
linux-2.6.14/scripts/mod/.gitignore
---- linux-2.6.14.orig/scripts/mod/.gitignore 2005-10-28 00:02:08.000000000
+0000
-+++ linux-2.6.14/scripts/mod/.gitignore 1970-01-01 00:00:00.000000000
+0000
-@@ -1,4 +0,0 @@
--elfconfig.h
--mk_elfconfig
--modpost
--
diff -Naur linux-2.6.14.orig/sound/oss/Kconfig linux-2.6.14/sound/oss/Kconfig
--- linux-2.6.14.orig/sound/oss/Kconfig 2005-10-28 00:02:08.000000000
+0000
+++ linux-2.6.14/sound/oss/Kconfig 2005-11-03 05:30:42.000000000 +0000
@@ -141712,14 +141650,3 @@
+
+MODULE_AUTHOR("Advanced Micro Devices (AMD), [EMAIL PROTECTED]");
+MODULE_DESCRIPTION("Au1550 I2S Audio Driver");
-diff -Naur linux-2.6.14.orig/usr/.gitignore linux-2.6.14/usr/.gitignore
---- linux-2.6.14.orig/usr/.gitignore 2005-10-28 00:02:08.000000000 +0000
-+++ linux-2.6.14/usr/.gitignore 1970-01-01 00:00:00.000000000 +0000
-@@ -1,7 +0,0 @@
--#
--# Generated files
--#
--gen_init_cpio
--initramfs_data.cpio
--initramfs_data.cpio.gz
--initramfs_list
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
