update ag241 to 2.6.33

package/sangam-atm/patches/patch-tn7dsl_c

@@ -1,5 +1,5 @@
 --- sangam-atm-1.0.orig/tn7dsl.c	2007-01-04 09:04:14.000000000 +0100
-+++ sangam-atm-1.0/tn7dsl.c	2009-12-17 23:40:56.457448616 +0100
++++ sangam-atm-1.0/tn7dsl.c	2010-03-06 12:40:16.000000000 +0100
 @@ -94,7 +94,6 @@
  *  1/02/07  JZ     CQ11054: Data Precision and Range Changes for TR-069 Conformance
  *  UR8_MERGE_END   CQ11054*
@@ -64,16 +64,15 @@
  int testflag1 = 0;
  extern int  __guDbgLevel;
  extern sar_stat_t sarStat;
-@@ -173,7 +203,7 @@ led_reg_t ledreg[2];
+@@ -173,7 +203,6 @@ led_reg_t ledreg[2];
  static struct led_funcs ledreg[2];
  #endif
  
 -#define DEV_DSLMOD       1
-+#define DEV_DSLMOD       CTL_UNNUMBERED
  #define MAX_STR_SIZE     256
  #define DSL_MOD_SIZE     256
  
-@@ -299,7 +329,7 @@ static PITIDSLHW_T    pIhw;
+@@ -299,7 +328,7 @@ static PITIDSLHW_T    pIhw;
  static volatile int bshutdown;
  static char info[MAX_STR_SIZE];
  /* Used for DSL Polling enable */
@@ -82,7 +81,7 @@
  
  //kthread_t overlay_thread;
  /* end of module wide declars */
-@@ -309,8 +339,7 @@ static void tn7dsl_chng_modulation(void*
+@@ -309,8 +338,7 @@ static void tn7dsl_chng_modulation(void*
  static unsigned int tn7dsl_set_modulation(void* data, int flag);
  static void tn7dsl_ctrl_fineGain(int value);
  static void tn7dsl_set_fineGainValue(int value);
@@ -92,7 +91,7 @@
  static void tn7dsl_register_dslss_led(void);
  void tn7dsl_dslmod_sysctl_register(void);
  void tn7dsl_dslmod_sysctl_unregister(void);
-@@ -323,6 +352,14 @@ static int tn7dsl_proc_snr_print (char *
+@@ -323,6 +351,14 @@ static int tn7dsl_proc_snr_print (char *
  #define gDot1(a) ((a>0)?(a%10):((-a)%10))
  //  UR8_MERGE_END   CQ11054*
  
@@ -107,7 +106,7 @@
  int os_atoi(const char *pStr)
  {
    int MulNeg = (*pStr == '-' ? -1 : 1);
-@@ -359,39 +396,6 @@ void dprintf (int uDbgLevel, char *szFmt
+@@ -359,39 +395,6 @@ void dprintf (int uDbgLevel, char *szFmt
  #endif
  }
  
@@ -147,7 +146,7 @@
  // * UR8_MERGE_START CQ10640   Jack Zhang
  int tn7dsl_dump_dsp_memory(char *input_str) //cph99
    {
-@@ -441,101 +445,79 @@ unsigned int shim_osGetCpuFrequency(void
+@@ -441,101 +444,79 @@ unsigned int shim_osGetCpuFrequency(void
    return CpuFrequency;
  }
  
@@ -312,7 +311,7 @@
  }
  
  int shim_osLoadDebugFWImage(unsigned char *ptr)
-@@ -2834,7 +2816,6 @@ static int tn7dsl_set_dsl(void)
+@@ -2834,7 +2815,6 @@ static int tn7dsl_set_dsl(void)
    int value;
    int i, offset[2]={4,11},oamFeature=0;
    char tmp[4];
@@ -320,7 +319,7 @@
  
    // OAM Feature Configuration
    dslhal_api_dspInterfaceRead (pIhw, (unsigned int) pIhw->pmainAddr, 2,
-@@ -2845,98 +2826,82 @@ static int tn7dsl_set_dsl(void)
+@@ -2845,98 +2825,82 @@ static int tn7dsl_set_dsl(void)
                                  (unsigned int *) &offset,
                                  (unsigned char *) &oamFeature, 4);
  
@@ -454,7 +453,7 @@
  
      tn7dsl_generic_read(2, offset);
      dslReg &= dslhal_support_byteSwap32(0xFFFFFF00);
-@@ -2954,46 +2919,47 @@ static int tn7dsl_set_dsl(void)
+@@ -2954,46 +2918,47 @@ static int tn7dsl_set_dsl(void)
    // maximum bits per carrier
    ptr = NULL;
    ptr = prom_getenv("maximum_bits_per_carrier");
@@ -513,7 +512,7 @@
      for(i=0;i<8;i++)
      {
        tmp[0]=ptr[i*2];
-@@ -3018,26 +2984,26 @@ static int tn7dsl_set_dsl(void)
+@@ -3018,26 +2983,26 @@ static int tn7dsl_set_dsl(void)
    }
    ptr = NULL;
    ptr = prom_getenv("eoc_vendor_revision");
@@ -546,7 +545,7 @@
    }
  
    return 0;
-@@ -3064,6 +3030,7 @@ int tn7dsl_init(void *priv)
+@@ -3064,6 +3029,7 @@ int tn7dsl_init(void *priv)
    int high_precision_selected = 0;  
  //  UR8_MERGE_END   CQ11054*
  
@@ -554,7 +553,7 @@
    /*
     * start dsl
     */
-@@ -3081,7 +3048,7 @@ int tn7dsl_init(void *priv)
+@@ -3081,7 +3047,7 @@ int tn7dsl_init(void *priv)
     * backward compatibility.
     */
    cp = prom_getenv("DSL_BIT_TMODE");
@@ -563,7 +562,7 @@
    {
      printk("%s : env var DSL_BIT_TMODE is set\n", __FUNCTION__);
      /*
-@@ -3110,9 +3077,9 @@ int tn7dsl_init(void *priv)
+@@ -3110,9 +3076,9 @@ int tn7dsl_init(void *priv)
  
  //  UR8_MERGE_START CQ11054   Jack Zhang
    cp = prom_getenv("high_precision");
@@ -575,7 +574,7 @@
    }
    if ( high_precision_selected)
    {
-@@ -3419,8 +3386,7 @@ unsigned int tn7dsl_get_memory(unsigned 
+@@ -3419,8 +3385,7 @@ unsigned int tn7dsl_get_memory(unsigned 
  
  
  
@@ -585,7 +584,7 @@
  {
    char *ptr;
    int ret, len = 0;
-@@ -3432,7 +3398,7 @@ static int dslmod_sysctl(ctl_table *ctl,
+@@ -3432,7 +3397,7 @@ static int dslmod_sysctl(ctl_table *ctl,
    char mod_req[16] = { '\t' };
    char fst_byt;
  
@@ -594,16 +593,76 @@
    {
      *lenp = 0;
      return 0;
-@@ -3442,7 +3408,7 @@ static int dslmod_sysctl(ctl_table *ctl,
+@@ -3442,11 +3407,10 @@ static int dslmod_sysctl(ctl_table *ctl,
     */
    if(write)
      {
 -    ret = proc_dostring(ctl, write, filp, buffer, lenp);
 +    ret = proc_dostring(ctl, write, buffer, lenp, ppos);
  
-     switch (ctl->ctl_name)
+-    switch (ctl->ctl_name)
++    if (strcmp(ctl->procname, "dslmod") == 0) 
        {
-@@ -3528,14 +3494,14 @@ static int dslmod_sysctl(ctl_table *ctl,
+-      case DEV_DSLMOD:
+       ptr = strpbrk(info, " \t");
+       strcpy(mod_req, info);
+ 
+@@ -3456,7 +3420,7 @@ static int dslmod_sysctl(ctl_table *ctl,
+       if (!strcmp (info, "dspfreq"))
+       {
+         printk("dsp_freq = %d\n", SAR_FREQUNCY * 4);
+-        break;
++	return 0;
+       }
+       else if (!strncmp(info,"nohost", 6))
+       {
+@@ -3481,14 +3445,14 @@ static int dslmod_sysctl(ctl_table *ctl,
+             i, curr_setting.phyEnableDisableWord,
+             i, curr_setting.phyControlWord);
+         }
+-        break;
++	return 0;
+       }
+ // * UR8_MERGE_START CQ10880   Jack Zhang
+       else if (!strcmp(info,"dsp_l3msg"))
+       {
+         //printk("dsp_l3msg sent to DSP\n");
+         dslhal_api_sendL3Command(pIhw);
+-        break;
++	return 0;
+       }
+ // * UR8_MERGE_END   CQ10880*
+ 
+@@ -3503,51 +3467,57 @@ static int dslmod_sysctl(ctl_table *ctl,
+                 if( fst_byt == 'S') type = type | (1 << 1);
+                 ret = tn7sar_oam_generation (pIhw->pOsContext, chan, type, vpi, vci, timeout);
+                 break;
+-
+-       case 'F':
++      case 'F':
+                 chan = tn7dsl_process_txflush_string (&queue, mod_req);
+                 if (chan < 16)
+                     tn7sar_tx_flush (pIhw->pOsContext, chan, queue, 0);
+                 break;
+       case 'D':
+-// * UR8_MERGE_START CQ10640   Jack Zhang
+-                if (mod_req[0]=='d') //cph99
++                if (mod_req[0]=='d')
+                   tn7dsl_dump_dsp_memory (&mod_req[1]);
+                 else 
+                   tn7dsl_dump_memory (&mod_req[1]);
+-// * UR8_MERGE_END   CQ10640*
+-      break;
++      		break;
+       case 'W':
+                 tn7dsl_write_memory(&mod_req[1]);
+                 break;
+       default:
+                tn7dsl_chng_modulation (info);
+       }
+-      }
++     }
+     }
    else
      {
      len += sprintf(info+len, mod_req);
@@ -616,11 +675,39 @@
  
  ctl_table dslmod_table[] = {
 -  {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, &dslmod_sysctl}
-+  {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, NULL, &dslmod_sysctl, &sysctl_string}
+-  ,
-   ,
+-  {0}
-   {0}
+-  };
-   };
++  	{
-@@ -3558,8 +3524,7 @@ void tn7dsl_dslmod_sysctl_register(void)
++		.procname	= "dslmod", 
++		.data		= info, 
++		.maxlen		= DSL_MOD_SIZE, 
++		.mode		= 0644, 
++		.proc_handler	= &dslmod_sysctl
++	},
++ 	{ }
++};
+ 
+ /* Make sure that /proc/sys/dev is there */
+ ctl_table dslmod_root_table[] = {
+ #ifdef CONFIG_PROC_FS
+-  {CTL_DEV, "dev", NULL, 0, 0555, dslmod_table}
+-  ,
++  {
++		.procname	= "dev", 
++		.maxlen		= 0, 
++		.mode		= 0555, 
++		.child		= dslmod_table,
++  },
+ #endif /* CONFIG_PROC_FS */
+-  {0}
+-  };
++  { }
++};
+ 
+ static struct ctl_table_header *dslmod_sysctl_header;
+ 
+@@ -3558,8 +3528,7 @@ void tn7dsl_dslmod_sysctl_register(void)
    if (initialized == 1)
      return;
  
@@ -630,7 +717,7 @@
  
    /*
     * set the defaults
-@@ -4821,4 +4786,4 @@ int tn7dsl_proc_PMDus(char* buf, char **
+@@ -4821,4 +4790,4 @@ int tn7dsl_proc_PMDus(char* buf, char **
  }
  #endif //NO_ADV_STATS
  #endif //TR69_PMD_IN

target/Config.in

@@ -308,6 +308,7 @@ config ADK_LINUX_MIPS_AG241
 	select ADK_KPACKAGE_KMOD_ATM_BR2684
 	select ADK_PACKAGE_BR2684CTL
 	select ADK_TARGET_WITH_DSL
+	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_ag241
 	help
 	  Linksys AG241 DSL router.

target/ag241/Makefile

@@ -16,7 +16,7 @@ tools-compile: $(TOOLS_BUILD_DIR)
 	$(MAKE) -C ../tools/squashfs prepare compile install
 
 kernel-install: tools-compile
-	${TARGET_CROSS}objcopy -S -O srec $(LINUX_DIR)/vmlinux \
+	${TARGET_CROSS}objcopy -S -O srec $(LINUX_DIR)/vmlinuz \
 		$(LINUX_DIR)/vmlinux.srec
 	PATH='${TARGET_PATH}' \
 	srec2bin $(LINUX_DIR)/vmlinux.srec $(LINUX_DIR)/vmlinux.bin

target/ag241/kernel.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32
+# Linux kernel version: 2.6.33
-# Sun Jan 31 19:36:46 2010
+# Sat Mar  6 12:49:00 2010
 #
 CONFIG_MIPS=y
 
@@ -10,7 +10,6 @@ CONFIG_MIPS=y
 #
 # CONFIG_MACH_ALCHEMY is not set
 CONFIG_AR7=y
-# CONFIG_BASLER_EXCITE is not set
 # CONFIG_BCM47XX is not set
 # CONFIG_BCM63XX is not set
 # CONFIG_MIPS_COBALT is not set
@@ -28,6 +27,7 @@ CONFIG_AR7=y
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
+# CONFIG_POWERTV is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set
@@ -48,6 +48,7 @@ CONFIG_AR7=y
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_ALCHEMY_GPIO_INDIRECT is not set
+CONFIG_LOONGSON_UART_BASE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -66,7 +67,6 @@ CONFIG_CSRC_R4K_LIB=y
 CONFIG_CSRC_R4K=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_EARLY_PRINTK=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_GPIO=y
@@ -82,6 +82,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CPU selection
 #
 # CONFIG_CPU_LOONGSON2E is not set
+# CONFIG_CPU_LOONGSON2F is not set
 CONFIG_CPU_MIPS32_R1=y
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -103,6 +104,8 @@ CONFIG_CPU_MIPS32_R1=y
 # CONFIG_CPU_RM9000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_CAVIUM_OCTEON is not set
+CONFIG_SYS_SUPPORTS_ZBOOT=y
+CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_CPU_MIPS32=y
 CONFIG_CPU_MIPSR1=y
@@ -141,8 +144,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_TICK_ONESHOT=y
@@ -176,6 +177,14 @@ CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -190,6 +199,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 #
 CONFIG_TREE_RCU=y
 # CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -207,11 +217,10 @@ CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
-CONFIG_BUG=y
+# CONFIG_BUG is not set
 # CONFIG_ELF_CORE is not set
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_BASE_FULL=y
@@ -256,14 +265,41 @@ CONFIG_BLOCK=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
 CONFIG_IOSCHED_DEADLINE=y
 # CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
 CONFIG_DEFAULT_DEADLINE=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="deadline"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 # CONFIG_FREEZER is not set
 
 #
@@ -378,9 +414,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_AF_RXRPC is not set
 CONFIG_WIRELESS=y
 # CONFIG_CFG80211 is not set
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-# CONFIG_WIRELESS_OLD_REGULATORY is not set
-# CONFIG_WIRELESS_EXT is not set
 # CONFIG_LIB80211 is not set
 
 #
@@ -492,6 +525,10 @@ CONFIG_MTD_PHYSMAP=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
@@ -544,6 +581,7 @@ CONFIG_MII=y
 # CONFIG_SMC91X is not set
 # CONFIG_DM9000 is not set
 # CONFIG_ETHOC is not set
+# CONFIG_SMSC911X is not set
 # CONFIG_DNET is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
@@ -559,8 +597,7 @@ CONFIG_CPMAC=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_WLAN=y
-# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_HOSTAP is not set
-# CONFIG_WLAN_80211 is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -788,11 +825,17 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_CMDLINE="console=ttyS0,38400 cpmac.dumb_switch=1"
+CONFIG_EARLY_PRINTK=y
+# CONFIG_CMDLINE_BOOL is not set
 
 #
 # Security options
@@ -800,7 +843,11 @@ CONFIG_CMDLINE="console=ttyS0,38400 cpmac.dumb_switch=1"
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
 CONFIG_CRYPTO=y
 
 #

target/ag241/patches/ar7.patch

@@ -1,6 +1,6 @@
-diff -Nur linux-2.6.32.orig/arch/mips/ar7/platform.c linux-2.6.32/arch/mips/ar7/platform.c
+diff -Nur linux-2.6.33.orig/arch/mips/ar7/platform.c linux-2.6.33/arch/mips/ar7/platform.c
---- linux-2.6.32.orig/arch/mips/ar7/platform.c	2009-12-03 04:51:21.000000000 +0100
+--- linux-2.6.33.orig/arch/mips/ar7/platform.c	2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.32/arch/mips/ar7/platform.c	2009-12-16 20:10:47.564817191 +0100
++++ linux-2.6.33/arch/mips/ar7/platform.c	2010-03-06 11:00:39.000000000 +0100
 @@ -509,7 +509,7 @@
  
  	memset(uart_port, 0, sizeof(struct uart_port) * 2);
@@ -19,9 +19,27 @@ diff -Nur linux-2.6.32.orig/arch/mips/ar7/platform.c linux-2.6.32/arch/mips/ar7/
  		uart_port[1].line = 1;
  		uart_port[1].irq = AR7_IRQ_UART1;
  		uart_port[1].uartclk = ar7_bus_freq() / 2;
-diff -Nur linux-2.6.32.orig/arch/mips/include/asm/page.h linux-2.6.32/arch/mips/include/asm/page.h
+diff -Nur linux-2.6.33.orig/arch/mips/ar7/prom.c linux-2.6.33/arch/mips/ar7/prom.c
---- linux-2.6.32.orig/arch/mips/include/asm/page.h	2009-12-03 04:51:21.000000000 +0100
+--- linux-2.6.33.orig/arch/mips/ar7/prom.c	2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.32/arch/mips/include/asm/page.h	2009-12-16 20:10:47.576432079 +0100
++++ linux-2.6.33/arch/mips/ar7/prom.c	2010-03-06 11:00:45.000000000 +0100
+@@ -219,6 +219,14 @@
+ 	if (strstr(prom_getcmdline(), "console="))
+ 		return;
+ 
++#ifdef CONFIG_KGDB
++	if (!strstr(prom_getcmdline(), "nokgdb")) {
++		strcat(prom_getcmdline(), " console=kgdb");
++		kgdb_enabled = 1;
++		return;
++	}
++#endif
++
+ 	s = prom_getenv("modetty0");
+ 	if (s) {
+ 		baud = simple_strtoul(s, &p, 10);
+diff -Nur linux-2.6.33.orig/arch/mips/include/asm/page.h linux-2.6.33/arch/mips/include/asm/page.h
+--- linux-2.6.33.orig/arch/mips/include/asm/page.h	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/mips/include/asm/page.h	2010-03-06 11:00:39.000000000 +0100
 @@ -200,8 +200,11 @@
  #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
  				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -36,10 +54,10 @@ diff -Nur linux-2.6.32.orig/arch/mips/include/asm/page.h linux-2.6.32/arch/mips/
  
  #include <asm-generic/memory_model.h>
  #include <asm-generic/getorder.h>
-diff -Nur linux-2.6.32.orig/arch/mips/Kconfig linux-2.6.32/arch/mips/Kconfig
+diff -Nur linux-2.6.33.orig/arch/mips/Kconfig linux-2.6.33/arch/mips/Kconfig
---- linux-2.6.32.orig/arch/mips/Kconfig	2009-12-14 21:11:40.737752912 +0100
+--- linux-2.6.33.orig/arch/mips/Kconfig	2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.32/arch/mips/Kconfig	2009-12-16 20:10:47.592420151 +0100
++++ linux-2.6.33/arch/mips/Kconfig	2010-03-06 11:00:39.000000000 +0100
-@@ -30,7 +30,6 @@
+@@ -34,7 +34,6 @@
  	select CEVT_R4K
  	select CSRC_R4K
  	select IRQ_CPU
@@ -47,10 +65,10 @@ diff -Nur linux-2.6.32.orig/arch/mips/Kconfig linux-2.6.32/arch/mips/Kconfig
  	select SWAP_IO_SPACE
  	select SYS_HAS_CPU_MIPS32_R1
  	select SYS_HAS_EARLY_PRINTK
-diff -Nur linux-2.6.32.orig/arch/mips/kernel/traps.c linux-2.6.32/arch/mips/kernel/traps.c
+diff -Nur linux-2.6.33.orig/arch/mips/kernel/traps.c linux-2.6.33/arch/mips/kernel/traps.c
---- linux-2.6.32.orig/arch/mips/kernel/traps.c	2009-12-03 04:51:21.000000000 +0100
+--- linux-2.6.33.orig/arch/mips/kernel/traps.c	2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.32/arch/mips/kernel/traps.c	2009-12-16 20:10:47.596422057 +0100
++++ linux-2.6.33/arch/mips/kernel/traps.c	2010-03-06 11:00:39.000000000 +0100
-@@ -1255,9 +1255,22 @@
+@@ -1283,9 +1283,22 @@
  
  	exception_handlers[n] = handler;
  	if (n == 0 && cpu_has_divec) {
@@ -76,9 +94,9 @@ diff -Nur linux-2.6.32.orig/arch/mips/kernel/traps.c linux-2.6.32/arch/mips/kern
  	}
  	return (void *)old_handler;
  }
-diff -Nur linux-2.6.32.orig/drivers/mtd/ar7part.c linux-2.6.32/drivers/mtd/ar7part.c
+diff -Nur linux-2.6.33.orig/drivers/mtd/ar7part.c linux-2.6.33/drivers/mtd/ar7part.c
---- linux-2.6.32.orig/drivers/mtd/ar7part.c	2009-12-03 04:51:21.000000000 +0100
+--- linux-2.6.33.orig/drivers/mtd/ar7part.c	2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.32/drivers/mtd/ar7part.c	2009-12-17 10:51:32.044434005 +0100
++++ linux-2.6.33/drivers/mtd/ar7part.c	2010-03-06 11:00:39.000000000 +0100
 @@ -28,7 +28,7 @@
  #include <linux/bootmem.h>
  #include <linux/magic.h>
@@ -110,10 +128,10 @@ diff -Nur linux-2.6.32.orig/drivers/mtd/ar7part.c linux-2.6.32/drivers/mtd/ar7pa
  	*pparts = ar7_parts;
  	return AR7_PARTS;
  }
-diff -Nur linux-2.6.32.orig/drivers/mtd/maps/physmap.c linux-2.6.32/drivers/mtd/maps/physmap.c
+diff -Nur linux-2.6.33.orig/drivers/mtd/maps/physmap.c linux-2.6.33/drivers/mtd/maps/physmap.c
---- linux-2.6.32.orig/drivers/mtd/maps/physmap.c	2009-12-03 04:51:21.000000000 +0100
+--- linux-2.6.33.orig/drivers/mtd/maps/physmap.c	2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.32/drivers/mtd/maps/physmap.c	2009-12-16 20:12:01.388510102 +0100
++++ linux-2.6.33/drivers/mtd/maps/physmap.c	2010-03-06 11:00:39.000000000 +0100
-@@ -80,7 +80,7 @@
+@@ -79,7 +79,7 @@
  					"map_rom",
  					NULL };
  #ifdef CONFIG_MTD_PARTITIONS
@@ -122,22 +140,10 @@ diff -Nur linux-2.6.32.orig/drivers/mtd/maps/physmap.c linux-2.6.32/drivers/mtd/
  #endif
  
  static int physmap_flash_probe(struct platform_device *dev)
-diff -Nur linux-2.6.32.orig/drivers/net/cpmac.c linux-2.6.32/drivers/net/cpmac.c
+diff -Nur linux-2.6.33.orig/drivers/serial/8250.c linux-2.6.33/drivers/serial/8250.c
---- linux-2.6.32.orig/drivers/net/cpmac.c	2009-12-03 04:51:21.000000000 +0100
+--- linux-2.6.33.orig/drivers/serial/8250.c	2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.32/drivers/net/cpmac.c	2009-12-16 21:24:20.356422767 +0100
++++ linux-2.6.33/drivers/serial/8250.c	2010-03-06 11:00:39.000000000 +0100
-@@ -1165,7 +1165,7 @@
+@@ -2715,7 +2715,11 @@
- 	priv->dev = dev;
- 	priv->ring_size = 64;
- 	priv->msg_enable = netif_msg_init(debug_level, 0xff);
--	memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
-+	memcpy(dev->dev_addr, pdata->dev_addr, ETH_ALEN);
- 
- 	snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
- 
-diff -Nur linux-2.6.32.orig/drivers/serial/8250.c linux-2.6.32/drivers/serial/8250.c
---- linux-2.6.32.orig/drivers/serial/8250.c	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/drivers/serial/8250.c	2009-12-16 20:10:58.820421544 +0100
-@@ -2714,7 +2714,11 @@
  {
  	struct uart_8250_port *up = (struct uart_8250_port *)port;
  
@@ -149,21 +155,3 @@ diff -Nur linux-2.6.32.orig/drivers/serial/8250.c linux-2.6.32/drivers/serial/82
  	serial_out(up, UART_TX, ch);
  }
  
-diff -Nur linux-2.6.32.orig/arch/mips/ar7/prom.c linux-2.6.32/arch/mips/ar7/prom.c
---- linux-2.6.32.orig/arch/mips/ar7/prom.c	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/mips/ar7/prom.c	2010-01-05 20:39:11.000000000 +0100
-@@ -219,14 +219,6 @@
- 	if (strstr(prom_getcmdline(), "console="))
- 		return;
- 
--#ifdef CONFIG_KGDB
--	if (!strstr(prom_getcmdline(), "nokgdb")) {
--		strcat(prom_getcmdline(), " console=kgdb");
--		kgdb_enabled = 1;
--		return;
--	}
--#endif
--
- 	s = prom_getenv("modetty0");
- 	if (s) {
- 		baud = simple_strtoul(s, &p, 10);

target/ag241/target.mk

@@ -1,7 +1,7 @@
 ARCH:=			mips
 CPU_ARCH:=		mipsel
-KERNEL_VERSION:=	2.6.32
+KERNEL_VERSION:=	2.6.33
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		260551284ac224c3a43c4adac7df4879
+KERNEL_MD5SUM:=		c3883760b18d50e8d78819c54d579b00
 TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    -march=mips32