conf and linux: update ts72xx to 2.6.24 kernel. Closes 3906.

diff --git a/conf/machine/ts72xx.conf b/conf/machine/ts72xx.conf
index 632f304..960deb7 100644 (file)
--- a/conf/machine/ts72xx.conf
+++ b/conf/machine/ts72xx.conf
@@ -7,13 +7,10 @@ PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
-MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
-
-# default is 2.6.22.6
-#PREFERRED_VERSION_linux = "2.6.23-rc5"
+MACHINE_FEATURES = "kernel26 ext2 usbhost bluetooth"
 
 SERIAL_CONSOLE = "115200 ttyAM0"
 USE_VT = "0"
-CMDLINE = "console=ttyAM0,115200 ip=192.168.1.3:192.168.1.2:192.168.1.2:255.255.255.0 root=/dev/nfs nfsroot=192.168.1.2:/media/data/devel/om2007.2/ts72xx/tmp/deploy/glibc/images/ts72xx/nfs_root"
+CMDLINE = "console=ttyAM0,115200 ip=192.168.1.3:192.168.1.2:192.168.1.2:255.255.255.0 root=/dev/nfs nfsroot=192.168.1.2:/media/data/devel/oe/ts72xx-stable/tmp/deploy/glibc/images/ts72xx/nfsroot"
 
 require conf/machine/include/tune-arm920t.inc

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/.mtn2git_empty b/packages/linux/linux-2.6.24/ts72xx/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/.mtn2git_empty
rename to packages/linux/linux-2.6.24/ts72xx/.mtn2git_empty

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-gpio-interrupt-debounce.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-gpio-interrupt-debounce.diff
similarity index 80%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-gpio-interrupt-debounce.diff
rename to packages/linux/linux-2.6.24/ts72xx/ep93xx-gpio-interrupt-debounce.diff
index dbd2856..27146c3 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-gpio-interrupt-debounce.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-gpio-interrupt-debounce.diff
@@ -3,11 +3,11 @@ Implement GPIO interrupt debouncing on ep93xx.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
+Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mach-ep93xx/core.c  2007-09-04 02:22:19.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c       2007-09-04 02:28:19.000000000 +0200
-@@ -154,6 +154,7 @@
+--- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c
++++ linux-2.6.22/arch/arm/mach-ep93xx/core.c
+@@ -154,6 +154,7 @@ struct sys_timer ep93xx_timer = {
   *************************************************************************/
  static unsigned char gpio_int_unmasked[3];
  static unsigned char gpio_int_enabled[3];
@@ -15,7 +15,7 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
  static unsigned char gpio_int_type1[3];
  static unsigned char gpio_int_type2[3];
  
-@@ -161,16 +162,19 @@
+@@ -161,16 +162,19 @@ static void update_gpio_int_params(int a
  {
        if (abf == 0) {
                __raw_writeb(0, EP93XX_GPIO_A_INT_ENABLE);
@@ -35,7 +35,7 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
                __raw_writeb(gpio_int_type2[2], EP93XX_GPIO_F_INT_TYPE2);
                __raw_writeb(gpio_int_type1[2], EP93XX_GPIO_F_INT_TYPE1);
                __raw_writeb(gpio_int_unmasked[2] & gpio_int_enabled[2], EP93XX_GPIO_F_INT_ENABLE);
-@@ -361,6 +365,13 @@
+@@ -361,6 +365,13 @@ static int ep93xx_gpio_irq_type(unsigned
        } else {
                gpio_int_enabled[port] &= ~(1 << line);
        }
@@ -49,10 +49,10 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
        update_gpio_int_params(port);
  
        return 0;
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h    2007-09-04 02:22:19.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-09-04 02:28:19.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h
 @@ -78,16 +78,19 @@
  #define EP93XX_GPIO_F_INT_ACK         EP93XX_GPIO_REG(0x54)
  #define EP93XX_GPIO_F_INT_ENABLE      EP93XX_GPIO_REG(0x58)
@@ -73,11 +73,11 @@ Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h
  
  #define EP93XX_AAC_BASE                       (EP93XX_APB_VIRT_BASE + 0x00080000)
  
-Index: linux-2.6.23-rc5/include/linux/irq.h
+Index: linux-2.6.22/include/linux/irq.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/linux/irq.h  2007-09-04 02:24:58.000000000 +0200
-+++ linux-2.6.23-rc5/include/linux/irq.h       2007-09-04 02:25:01.000000000 +0200
-@@ -44,6 +44,7 @@
+--- linux-2.6.22.orig/include/linux/irq.h
++++ linux-2.6.22/include/linux/irq.h
+@@ -44,6 +44,7 @@ typedef      void fastcall (*irq_flow_handler
  #define IRQ_TYPE_LEVEL_LOW    0x00000008      /* Level low type */
  #define IRQ_TYPE_SENSE_MASK   0x0000000f      /* Mask of the above */
  #define IRQ_TYPE_PROBE                0x00000010      /* Probing in progress */

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c-bus.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c-bus.diff
similarity index 83%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c-bus.diff
rename to packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c-bus.diff
index efdbf42..d3c6694 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c-bus.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c-bus.diff
@@ -3,13 +3,13 @@ I2C bus driver using ep93xx GPIOs.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/drivers/i2c/busses/Kconfig
+Index: linux-2.6.22/drivers/i2c/busses/Kconfig
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/i2c/busses/Kconfig   2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/i2c/busses/Kconfig        2007-09-04 02:26:20.000000000 +0200
-@@ -654,4 +654,16 @@
-         This driver can also be built as module. If so, the module
-         will be called i2c-pmcmsp.
+--- linux-2.6.22.orig/drivers/i2c/busses/Kconfig       2007-08-30 00:42:45.000000000 +0200
++++ linux-2.6.22/drivers/i2c/busses/Kconfig    2007-08-30 00:42:52.000000000 +0200
+@@ -635,4 +635,16 @@
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-pnx.
  
 +config I2C_EP93XX
 +      tristate "Cirrus Logic EP93XX GPIO-based I2C interface"
@@ -24,10 +24,10 @@ Index: linux-2.6.23-rc5/drivers/i2c/busses/Kconfig
 +
 +
  endmenu
-Index: linux-2.6.23-rc5/drivers/i2c/busses/Makefile
+Index: linux-2.6.22/drivers/i2c/busses/Makefile
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/i2c/busses/Makefile  2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/i2c/busses/Makefile       2007-09-04 02:26:20.000000000 +0200
+--- linux-2.6.22.orig/drivers/i2c/busses/Makefile      2007-08-30 00:42:45.000000000 +0200
++++ linux-2.6.22/drivers/i2c/busses/Makefile   2007-08-30 00:42:52.000000000 +0200
 @@ -52,6 +52,7 @@
  obj-$(CONFIG_I2C_VOODOO3)     += i2c-voodoo3.o
  obj-$(CONFIG_SCx200_ACB)      += scx200_acb.o
@@ -36,10 +36,10 @@ Index: linux-2.6.23-rc5/drivers/i2c/busses/Makefile
  
  ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
  EXTRA_CFLAGS += -DDEBUG
-Index: linux-2.6.23-rc5/drivers/i2c/busses/i2c-ep93xx.c
+Index: linux-2.6.22/drivers/i2c/busses/i2c-ep93xx.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc5/drivers/i2c/busses/i2c-ep93xx.c   2007-09-04 02:26:20.000000000 +0200
++++ linux-2.6.22/drivers/i2c/busses/i2c-ep93xx.c       2007-08-30 00:42:52.000000000 +0200
 @@ -0,0 +1,159 @@
 +/*
 + * EP93XX I2C bus driver.
@@ -200,10 +200,10 @@ Index: linux-2.6.23-rc5/drivers/i2c/busses/i2c-ep93xx.c
 +MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>");
 +MODULE_DESCRIPTION("GPIO-based I2C adapter for EP93XX systems");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/platform.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/platform.h       2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/platform.h    2007-09-04 02:28:19.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/platform.h   2007-08-30 00:42:45.000000000 +0200
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h        2007-08-30 00:42:52.000000000 +0200
 @@ -16,5 +16,13 @@
        unsigned char   phy_id;
  };

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c.diff
similarity index 78%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c.diff
rename to packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c.diff
index bf4622b..b68fb14 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c.diff
@@ -4,10 +4,10 @@ code.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
+Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mach-ep93xx/core.c  2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c       2007-09-04 02:28:12.000000000 +0200
+--- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c      2007-08-30 00:42:49.000000000 +0200
++++ linux-2.6.22/arch/arm/mach-ep93xx/core.c   2007-08-30 00:43:00.000000000 +0200
 @@ -509,6 +509,52 @@
  };
  
@@ -82,10 +82,10 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
        platform_device_register(&ep93xx_ohci_device);
 +      platform_device_register(&ep93xx_i2c_device);
  }
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h    2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-09-04 02:28:10.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h        2007-08-30 00:42:49.000000000 +0200
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h     2007-08-30 00:43:00.000000000 +0200
 @@ -91,6 +91,7 @@
  #define EP93XX_GPIO_B_INT_ENABLE      EP93XX_GPIO_REG(0xb8)
  #define EP93XX_GPIO_B_INT_STATUS      EP93XX_GPIO_REG(0xbc)
@@ -94,10 +94,10 @@ Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h
  
  #define EP93XX_AAC_BASE                       (EP93XX_APB_VIRT_BASE + 0x00080000)
  
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/platform.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/platform.h       2007-09-04 02:26:20.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/platform.h    2007-09-04 02:26:38.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/platform.h   2007-08-30 00:42:52.000000000 +0200
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h        2007-08-30 00:43:00.000000000 +0200
 @@ -10,6 +10,9 @@
  void ep93xx_init_devices(void);
  extern struct sys_timer ep93xx_timer;

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-leds.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-leds.diff
similarity index 78%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-leds.diff
rename to packages/linux/linux-2.6.24/ts72xx/ep93xx-leds.diff
index e158593..9836145 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-leds.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-leds.diff
@@ -3,11 +3,11 @@ EP93xx leds driver
 
 Signed-off-by: Petr Stetiar <ynezz@true.cz>
 
-Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
+Index: linux-2.6.24/arch/arm/mach-ep93xx/core.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mach-ep93xx/core.c  2007-09-04 02:40:19.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c       2007-09-04 02:40:25.000000000 +0200
-@@ -568,6 +568,12 @@
+--- linux-2.6.24.orig/arch/arm/mach-ep93xx/core.c      2008-02-03 13:06:34.000000000 +0100
++++ linux-2.6.24/arch/arm/mach-ep93xx/core.c   2008-02-03 13:38:46.000000000 +0100
+@@ -555,6 +555,12 @@
  }
  
  
@@ -20,19 +20,19 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
  void __init ep93xx_init_devices(void)
  {
        unsigned int v;
-@@ -596,4 +602,5 @@
+@@ -583,4 +589,5 @@
        platform_device_register(&ep93xx_rtc_device);
        platform_device_register(&ep93xx_ohci_device);
        platform_device_register(&ep93xx_i2c_device);
 +      platform_device_register(&ep93xx_led_device);
  }
-Index: linux-2.6.23-rc5/drivers/leds/Kconfig
+Index: linux-2.6.24/drivers/leds/Kconfig
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/leds/Kconfig 2007-09-04 02:40:19.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/leds/Kconfig      2007-09-04 02:40:25.000000000 +0200
-@@ -101,6 +101,12 @@
-         outputs. To be useful the particular board must have LEDs
-         and they must be connected to the GPIO lines.
+--- linux-2.6.24.orig/drivers/leds/Kconfig     2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/leds/Kconfig  2008-02-03 13:38:46.000000000 +0100
+@@ -114,6 +114,12 @@
+       help
+         This option enables support for the CM-X270 LEDs.
  
 +config LEDS_EP93XX
 +      tristate "LED Support for Cirrus Logic EP93xx"
@@ -43,22 +43,22 @@ Index: linux-2.6.23-rc5/drivers/leds/Kconfig
  comment "LED Triggers"
  
  config LEDS_TRIGGERS
-Index: linux-2.6.23-rc5/drivers/leds/Makefile
+Index: linux-2.6.24/drivers/leds/Makefile
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/leds/Makefile        2007-09-04 02:40:19.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/leds/Makefile     2007-09-04 02:40:25.000000000 +0200
-@@ -16,6 +16,7 @@
- obj-$(CONFIG_LEDS_WRAP)                       += leds-wrap.o
- obj-$(CONFIG_LEDS_H1940)              += leds-h1940.o
- obj-$(CONFIG_LEDS_COBALT)             += leds-cobalt.o
-+obj-$(CONFIG_LEDS_EP93XX)             += leds-ep93xx.o
+--- linux-2.6.24.orig/drivers/leds/Makefile    2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/leds/Makefile 2008-02-03 13:40:49.000000000 +0100
+@@ -19,6 +19,7 @@
+ obj-$(CONFIG_LEDS_COBALT_RAQ)         += leds-cobalt-raq.o
  obj-$(CONFIG_LEDS_GPIO)                       += leds-gpio.o
+ obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
++obj-$(CONFIG_LEDS_EP93XX)             += leds-ep93xx.o
  
  # LED Triggers
-Index: linux-2.6.23-rc5/drivers/leds/leds-ep93xx.c
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
+Index: linux-2.6.24/drivers/leds/leds-ep93xx.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc5/drivers/leds/leds-ep93xx.c        2007-09-04 02:40:25.000000000 +0200
++++ linux-2.6.24/drivers/leds/leds-ep93xx.c    2008-02-03 13:38:46.000000000 +0100
 @@ -0,0 +1,119 @@
 +/*
 + * LEDs driver for Cirrus Logic EP93xx

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-maverick-uniqid.patch b/packages/linux/linux-2.6.24/ts72xx/ep93xx-maverick-uniqid.patch
similarity index 66%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-maverick-uniqid.patch
rename to packages/linux/linux-2.6.24/ts72xx/ep93xx-maverick-uniqid.patch
index 0bc8190..fb6c8cf 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-maverick-uniqid.patch
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-maverick-uniqid.patch
@@ -3,11 +3,11 @@ Adds support for SoC's unique ID (Maverick Key) in /proc/cpuinfo
 
 Signed-off-by: Petr Stetiar <ynezz@true.cz>
 
-Index: linux-2.6.23-rc5/arch/arm/kernel/setup.c
+Index: linux-2.6.22/arch/arm/kernel/setup.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/kernel/setup.c      2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/kernel/setup.c   2007-09-04 02:26:49.000000000 +0200
-@@ -964,8 +964,15 @@
+--- linux-2.6.22.orig/arch/arm/kernel/setup.c  2007-09-02 23:08:51.000000000 +0200
++++ linux-2.6.22/arch/arm/kernel/setup.c       2007-09-02 23:10:24.000000000 +0200
+@@ -959,8 +959,15 @@
  
        seq_printf(m, "Hardware\t: %s\n", machine_name);
        seq_printf(m, "Revision\t: %04x\n", system_rev);
@@ -23,10 +23,10 @@ Index: linux-2.6.23-rc5/arch/arm/kernel/setup.c
  
        return 0;
  }
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h    2007-09-04 02:26:38.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-09-04 02:26:49.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h        2007-09-02 23:06:45.000000000 +0200
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h     2007-09-02 23:08:34.000000000 +0200
 @@ -70,6 +70,8 @@
  #define EP93XX_I2S_BASE                       (EP93XX_APB_VIRT_BASE + 0x00020000)
  

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-clocks.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-clocks.diff
similarity index 76%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-clocks.diff
rename to packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-clocks.diff
index 86b1489..9eb2d9d 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-clocks.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-clocks.diff
@@ -4,11 +4,11 @@ so that using ttyAM1 or ttyAM2 as console can work.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/uncompress.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/uncompress.h     2007-09-04 02:26:42.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/uncompress.h  2007-09-04 02:26:47.000000000 +0200
-@@ -78,6 +78,23 @@
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/uncompress.h
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h
+@@ -78,6 +78,23 @@ static void ethernet_reset(void)
  
  
  /*
@@ -32,7 +32,7 @@ Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/uncompress.h
   * Some bootloaders don't turn on the UARTBAUD bit, which means that
   * the UARTs will be running off a divided 7.3728 MHz clock instead of
   * the 14.7456 MHz peripheral clock when linux boots.
-@@ -126,6 +143,7 @@
+@@ -126,6 +143,7 @@ static void fix_uart_base(void)
  static void arch_decomp_setup(void)
  {
        ethernet_reset();

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-uartbaud.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-uartbaud.diff
similarity index 85%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-uartbaud.diff
rename to packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-uartbaud.diff
index 9cfaacd..7183ab6 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-uartbaud.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-uartbaud.diff
@@ -3,11 +3,11 @@ Force UARTBAUD on before uncompressing.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/uncompress.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/uncompress.h     2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/uncompress.h  2007-09-04 02:28:14.000000000 +0200
-@@ -77,9 +77,56 @@
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/uncompress.h
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h
+@@ -77,9 +77,56 @@ static void ethernet_reset(void)
  }
  
  

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-timer-accuracy.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-timer-accuracy.diff
similarity index 76%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-timer-accuracy.diff
rename to packages/linux/linux-2.6.24/ts72xx/ep93xx-timer-accuracy.diff
index 8a6de2e..8254153 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-timer-accuracy.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-timer-accuracy.diff
@@ -5,11 +5,11 @@ ticks until the next jiffy in a fractional value representation.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
+Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mach-ep93xx/core.c  2007-09-04 02:26:38.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c       2007-09-04 02:26:48.000000000 +0200
-@@ -94,19 +94,32 @@
+--- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c
++++ linux-2.6.22/arch/arm/mach-ep93xx/core.c
+@@ -94,19 +94,32 @@ void __init ep93xx_map_io(void)
   * track of lost jiffies.
   */
  static unsigned int last_jiffy_time;
@@ -47,10 +47,10 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
        }
  
        write_sequnlock(&xtime_lock);
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/timex.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/timex.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/timex.h  2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/timex.h       2007-09-04 02:26:48.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/timex.h
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/timex.h
 @@ -2,4 +2,4 @@
   * linux/include/asm-arm/arch-ep93xx/timex.h
   */

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/series b/packages/linux/linux-2.6.24/ts72xx/series
similarity index 94%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/series
rename to packages/linux/linux-2.6.24/ts72xx/series
index e5455ef..3295838 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/series
+++ b/packages/linux/linux-2.6.24/ts72xx/series
@@ -10,3 +10,4 @@ ts72xx-machine-id-fix.patch
 ts72xx-nfbit-fix.patch
 ts72xx-watchdog.patch 
 ts72xx-use-cpld-reset.patch
+ts72xx-rs485.patch

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-machine-id-fix.patch b/packages/linux/linux-2.6.24/ts72xx/ts72xx-machine-id-fix.patch
similarity index 66%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-machine-id-fix.patch
rename to packages/linux/linux-2.6.24/ts72xx/ts72xx-machine-id-fix.patch
index 47a07e6..64c3839 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-machine-id-fix.patch
+++ b/packages/linux/linux-2.6.24/ts72xx/ts72xx-machine-id-fix.patch
@@ -3,11 +3,11 @@ Fix wrong machine ID passed from RedBoot
 
 Signed-off-by: Petr Stetiar <ynezz@true.cz>
 
-Index: linux-2.6.23-rc5/arch/arm/kernel/head.S
+Index: linux-2.6.22/arch/arm/kernel/head.S
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/kernel/head.S       2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/kernel/head.S    2007-09-04 02:26:57.000000000 +0200
-@@ -86,6 +86,7 @@
+--- linux-2.6.22.orig/arch/arm/kernel/head.S   2007-08-30 00:42:45.000000000 +0200
++++ linux-2.6.22/arch/arm/kernel/head.S        2007-08-30 00:43:13.000000000 +0200
+@@ -82,6 +82,7 @@
        bl      __lookup_processor_type         @ r5=procinfo r9=cpuid
        movs    r10, r5                         @ invalid processor (r5=0)?
        beq     __error_p                       @ yes, error 'p'

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-nfbit-fix.patch b/packages/linux/linux-2.6.24/ts72xx/ts72xx-nfbit-fix.patch
similarity index 61%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-nfbit-fix.patch
rename to packages/linux/linux-2.6.24/ts72xx/ts72xx-nfbit-fix.patch
index bed3de3..eab7315 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-nfbit-fix.patch
+++ b/packages/linux/linux-2.6.24/ts72xx/ts72xx-nfbit-fix.patch
@@ -4,10 +4,8 @@ then the CPU core will run from HCLK instead of FCLK, and performance will
 suffer. If you see BogoMIPS of about 1/4 of your CPU clock, try turning this
 on; your performance should double.
 
-Index: linux-2.6.23-rc5/arch/arm/mm/proc-arm920.S
-===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mm/proc-arm920.S    2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mm/proc-arm920.S 2007-09-04 02:27:02.000000000 +0200
+--- linux-2.6.21.4/arch/arm/mm/proc-arm920.S   2007-06-07 23:27:31.000000000 +0200
++++ linux-2.6.21.4-arm/arch/arm/mm/proc-arm920.S       2007-06-08 22:59:48.000000000 +0200
 @@ -395,6 +395,7 @@
        mrc     p15, 0, r0, c1, c0              @ get control register v4
        bic     r0, r0, r5
@@ -15,4 +13,3 @@ Index: linux-2.6.23-rc5/arch/arm/mm/proc-arm920.S
 +      orr     r0, r0, #0x40000000
        mov     pc, lr
        .size   __arm920_setup, . - __arm920_setup
- 

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-use-cpld-reset.patch b/packages/linux/linux-2.6.24/ts72xx/ts72xx-use-cpld-reset.patch
similarity index 81%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-use-cpld-reset.patch
rename to packages/linux/linux-2.6.24/ts72xx/ts72xx-use-cpld-reset.patch
index 681622a..9744a67 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-use-cpld-reset.patch
+++ b/packages/linux/linux-2.6.24/ts72xx/ts72xx-use-cpld-reset.patch
@@ -4,10 +4,10 @@ sometimes get stuck...
 
 Signed-off-by: Petr Stetiar <ynezz@true.cz>
 
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/system.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/system.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/system.h 2007-09-04 02:29:35.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/system.h      2007-09-04 02:31:52.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/system.h     2007-08-30 00:53:47.000000000 +0200
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/system.h  2007-08-30 00:54:28.000000000 +0200
 @@ -3,6 +3,7 @@
   */
  

diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-watchdog.patch b/packages/linux/linux-2.6.24/ts72xx/ts72xx-watchdog.patch
similarity index 90%
rename from packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-watchdog.patch
rename to packages/linux/linux-2.6.24/ts72xx/ts72xx-watchdog.patch
index b406d1d..ff29c14 100644 (file)
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-watchdog.patch
+++ b/packages/linux/linux-2.6.24/ts72xx/ts72xx-watchdog.patch
@@ -3,10 +3,10 @@ TS-72xx watchdog driver
 
 Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>
 
-Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/ts72xx.c
+Index: linux-2.6.24/arch/arm/mach-ep93xx/ts72xx.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mach-ep93xx/ts72xx.c        2007-09-04 02:25:35.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mach-ep93xx/ts72xx.c     2007-09-04 02:27:06.000000000 +0200
+--- linux-2.6.24.orig/arch/arm/mach-ep93xx/ts72xx.c    2008-02-03 14:09:54.000000000 +0100
++++ linux-2.6.24/arch/arm/mach-ep93xx/ts72xx.c 2008-02-03 14:16:09.000000000 +0100
 @@ -183,6 +183,26 @@
        .resource       = ts72xx_eth_resource,
  };
@@ -42,10 +42,10 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/ts72xx.c
  }
  
  MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC")
-Index: linux-2.6.23-rc5/drivers/char/watchdog/Kconfig
+Index: linux-2.6.24/drivers/watchdog/Kconfig
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/char/watchdog/Kconfig        2007-09-04 02:25:35.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/char/watchdog/Kconfig     2007-09-04 02:27:06.000000000 +0200
+--- linux-2.6.24.orig/drivers/watchdog/Kconfig 2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/watchdog/Kconfig      2008-02-03 14:16:09.000000000 +0100
 @@ -247,6 +247,18 @@
  
  # H8300 Architecture
@@ -65,10 +65,10 @@ Index: linux-2.6.23-rc5/drivers/char/watchdog/Kconfig
  # X86 (i386 + ia64 + x86_64) Architecture
  
  config ACQUIRE_WDT
-Index: linux-2.6.23-rc5/drivers/char/watchdog/Makefile
+Index: linux-2.6.24/drivers/watchdog/Makefile
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/char/watchdog/Makefile       2007-09-04 02:25:35.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/char/watchdog/Makefile    2007-09-04 02:27:06.000000000 +0200
+--- linux-2.6.24.orig/drivers/watchdog/Makefile        2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/watchdog/Makefile     2008-02-03 14:16:09.000000000 +0100
 @@ -36,6 +36,7 @@
  obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
  obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
@@ -77,10 +77,10 @@ Index: linux-2.6.23-rc5/drivers/char/watchdog/Makefile
  obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
  obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
  obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
-Index: linux-2.6.23-rc5/drivers/char/watchdog/ts72xx_wdt.c
+Index: linux-2.6.24/drivers/watchdog/ts72xx_wdt.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc5/drivers/char/watchdog/ts72xx_wdt.c        2007-09-04 02:27:06.000000000 +0200
++++ linux-2.6.24/drivers/watchdog/ts72xx_wdt.c 2008-02-03 14:16:09.000000000 +0100
 @@ -0,0 +1,332 @@
 +/*
 + *    TS-72xx Watchdog Driver for Technologic Systems boards.
@@ -414,10 +414,10 @@ Index: linux-2.6.23-rc5/drivers/char/watchdog/ts72xx_wdt.c
 +MODULE_DESCRIPTION("TS-72xx watchdog driver");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ts72xx.h
+Index: linux-2.6.24/include/asm-arm/arch-ep93xx/ts72xx.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/ts72xx.h 2007-09-04 02:25:35.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ts72xx.h      2007-09-04 02:27:06.000000000 +0200
+--- linux-2.6.24.orig/include/asm-arm/arch-ep93xx/ts72xx.h     2008-02-03 14:09:54.000000000 +0100
++++ linux-2.6.24/include/asm-arm/arch-ep93xx/ts72xx.h  2008-02-03 14:16:09.000000000 +0100
 @@ -69,6 +69,9 @@
  #define TS72XX_RTC_DATA_SIZE          0x00001000
  

diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index d0a2ad7..a3ae2f9 100644 (file)
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -8,6 +8,7 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 DEFAULT_PREFERENCE_simpad = "1"
 DEFAULT_PREFERENCE_atngw100 = "1"
 DEFAULT_PREFERENCE_at32stk1000 = "1"
+DEFAULT_PREFERENCE_ts72xx = "1"
 
 DEPENDS_append_mpc8313e-rdb = " dtc-native"
 
@@ -64,6 +65,20 @@ SRC_URI_avr32 = "http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.
                  file://defconfig"
 S_avr32 = "${WORKDIR}/linux-2.6.24.3.atmel.3"
 
+SRC_URI_append_ts72xx = "\
+       file://ep93xx-gpio-interrupt-debounce.diff;patch=1 \
+       file://ep93xx-i2c-bus.diff;patch=1 \
+       file://ep93xx-i2c.diff;patch=1 \
+       file://ep93xx-leds.diff;patch=1 \
+       file://ep93xx-serial-uartbaud.diff;patch=1 \
+       file://ep93xx-serial-clocks.diff;patch=1 \
+       file://ep93xx-timer-accuracy.diff;patch=1 \
+       file://ep93xx-maverick-uniqid.patch;patch=1 \
+       file://ts72xx-nfbit-fix.patch;patch=1 \
+       file://ts72xx-machine-id-fix.patch;patch=1 \
+       file://ts72xx-watchdog.patch;patch=1 \
+       file://ts72xx-use-cpld-reset.patch;patch=1 \
+       file://ts72xx-rs485.patch;patch=1"
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"