- now on HEAD

[packages/kernel.git] / 2.6.4-psion-5mx.patch

diff --git a/2.6.4-psion-5mx.patch b/2.6.4-psion-5mx.patch
index 7039e4feb792b1d994d663e4bc55f9fdf6454c60..ffaea67f122e4d8bba92778e97e9f9e450499b20 100644 (file)
--- a/2.6.4-psion-5mx.patch
+++ b/2.6.4-psion-5mx.patch
@@ -29,23 +29,23 @@ diff -Nur linux-2.6.4-rc2.org/arch/arm/Kconfig linux-2.6.4-rc2/arch/arm/Kconfig
  # Select various configuration options depending on the machine type
  config DISCONTIGMEM
        bool
--      depends on ARCH_EDB7211 || ARCH_SA1100
-+      depends on ARCH_EDB7211 || ARCH_PSIONW || ARCH_SA1100
+-      depends on ARCH_EDB7211 || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
++      depends on ARCH_EDB7211 || ARCH_PSIONW || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
        default y
        help
          Say Y to upport efficient handling of discontiguous physical memory,
-diff -Nur linux-2.6.4-rc2.org/arch/arm/Makefile linux-2.6.4-rc2/arch/arm/Makefile
---- linux-2.6.4-rc2.org/arch/arm/Makefile      2004-03-09 13:22:59.000000000 +0000
-+++ linux-2.6.4-rc2/arch/arm/Makefile  2004-03-09 13:25:56.000000000 +0000
-@@ -99,6 +99,8 @@
-  machine-$(CONFIG_ARCH_ANAKIN)           := anakin
-  machine-$(CONFIG_ARCH_IOP3XX)           := iop3xx
-  machine-$(CONFIG_ARCH_ADIFCC)           := adifcc
-+textaddr-$(CONFIG_ARCH_PSIONW)     := 0xc0048000
-+ machine-$(CONFIG_ARCH_PSIONW)     := psionw
+diff -Nur linux-2.6.8.1.org/arch/arm/Makefile linux-2.6.8.1/arch/arm/Makefile
+--- linux-2.6.8.1.org/arch/arm/Makefile        2004-08-23 12:19:49.543457568 +0200
++++ linux-2.6.8.1/arch/arm/Makefile    2004-08-23 12:24:49.168907576 +0200
+@@ -94,6 +94,8 @@
+  machine-$(CONFIG_ARCH_S3C2410)          := s3c2410
+  machine-$(CONFIG_ARCH_LH7A40X)          := lh7a40x
+  machine-$(CONFIG_ARCH_VERSATILE_PB) := versatile
++textaddr-$(CONFIG_ARCH_PSIONW)           := 0xc0048000
++ machine-$(CONFIG_ARCH_PSIONW)           := psionw
+  machine-$(CONFIG_ARCH_IMX)      := imx
  
- MACHINE  := $(machine-y)
- TEXTADDR := $(textaddr-y)
+ ifeq ($(CONFIG_ARCH_EBSA110),y)
 diff -Nur linux-2.6.4-rc2.org/arch/arm/configs/psionw_defconfig linux-2.6.4-rc2/arch/arm/configs/psionw_defconfig
 --- linux-2.6.4-rc2.org/arch/arm/configs/psionw_defconfig      1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.4-rc2/arch/arm/configs/psionw_defconfig  2004-03-09 13:25:56.000000000 +0000
@@ -557,9 +557,9 @@ diff -Nur linux-2.6.4-rc2.org/arch/arm/kernel/debug.S linux-2.6.4-rc2/arch/arm/k
 +1002:
 +                .endm
 +      
- #elif defined(CONFIG_ARCH_ANAKIN)
+ #elif defined(CONFIG_ARCH_CAMELOT)
  
- //#//include <asm/arch/serial_reg.h>
+ #include <asm/arch/excalibur.h>
 diff -Nur linux-2.6.4-rc2.org/arch/arm/kernel/entry-armv.S linux-2.6.4-rc2/arch/arm/kernel/entry-armv.S
 --- linux-2.6.4-rc2.org/arch/arm/kernel/entry-armv.S   2004-03-04 06:16:41.000000000 +0000
 +++ linux-2.6.4-rc2/arch/arm/kernel/entry-armv.S       2004-03-09 13:25:56.000000000 +0000
@@ -1663,9 +1663,9 @@ diff -Nur linux-2.6.4-rc2.org/drivers/serial/Kconfig linux-2.6.4-rc2/drivers/ser
 +        your boot loader (lilo or loadlin) about how to pass options to the
 +        kernel at boot time.)
 +
- config SERIAL_INTEGRATOR
-       bool
-       depends on SERIAL_AMBA && ARCH_INTEGRATOR
+ config SERIAL_CLPS711X
+       tristate "CLPS771X serial port supprot:
+       depends on ARM && ARCH_CLPS711X
 diff -Nur linux-2.6.4-rc2.org/drivers/serial/Makefile linux-2.6.4-rc2/drivers/serial/Makefile
 --- linux-2.6.4-rc2.org/drivers/serial/Makefile        2004-03-04 06:16:46.000000000 +0000
 +++ linux-2.6.4-rc2/drivers/serial/Makefile    2004-03-09 13:29:22.000000000 +0000