--- linux/Makefile_original	Thu May 16 10:44:41 2002
+++ linux/Makefile	Wed May 15 09:48:37 2002
@@ -5,7 +5,7 @@
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
+ARCH := arm
 KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
 
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -19,7 +19,7 @@
 HOSTCC  	= gcc
 HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
 
-CROSS_COMPILE 	=
+CROSS_COMPILE 	= arm-linux-
 
 #
 # Include the make variables (CC, etc...)


--- linux/arch/arm/boot/Makefile_original	Wed May 15 10:53:06 2002
+++ linux/arch/arm/boot/Makefile	Wed May 15 10:55:44 2002
@@ -79,8 +79,14 @@
 
 # The standard locations for stuff on CLPS711x type processors
 ifeq ($(CONFIG_ARCH_CLPS711X),y)
-ZTEXTADDR	 = 0xc0028000
+# TESTASECCA THOMAS ETIC
+# ZTEXTADDR	 = 0xc0028000
 PARAMS_PHYS	 = 0xc0000100
+
+ZTEXTADDR        = 0x00020000
+ZRELADDR         = 0xc0028000
+ZBSSADDR         = 0xc0300000
+
 endif
 
 # Should probably have some agreement on these...

--- linux/drivers/mtd/nand/nand_original.c	Wed May 15 10:32:53 2002
+++ linux/drivers/mtd/nand/nand.c	Wed May 15 10:36:42 2002
@@ -228,8 +228,11 @@
  */
 static int nand_write_page(struct mtd_info *mtd, struct nand_chip *this,
 		int page,int col, int last, u_char *ecc_code) {
-
 	int	i, status;
+
+	/* TESTASECCA THOMAS */
+	size_t bidon = 0;
+        size_t* retlen=&bidon;
 #ifdef CONFIG_MTD_NAND_ECC
 	int ecc_bytes = (mtd->oobblock == 512) ? 6 : 3;
 #endif

--- linux/drivers/mtd/maps/cdb89712_original.c	Thu May 16 10:50:41 2002
+++ linux/drivers/mtd/maps/cdb89712.c	Thu May 16 10:54:56 2002
@@ -14,6 +14,39 @@
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 
+/* TESTASECCA THOMAS ETIC 06/03/2002 -  these defines the size of partitions */
+#define BOOT_PARTITION_SIZE      128
+#define KERNEL_PARTITION_SIZE    640
+#define ROOT_PARTITION_SIZE      1024   /* starting at 0x0c0000 */
+#define DATA_PARTITION_SIZE      2304   /* starting at 0x1c0000 */
+#define FREE_PARTITION_SIZE      4096   /* starting at 0x400000 */
+
+#define NUM_PARTITIONS 5
+
+/* partition_info gives details on the logical partitions that the split the
+ * single flash device into. If the size if zero we use up to the end of the
+ * device. */
+static struct mtd_partition partition_info[]={
+    { name: "cdb89712 flash boot partition",
+      offset: 0,
+      size:   BOOT_PARTITION_SIZE*1024 },
+
+    { name: "cdb89712 flash linux kernel partition",
+      offset: BOOT_PARTITION_SIZE*1024,
+      size: (KERNEL_PARTITION_SIZE)*1024 },
+
+    { name: "cdb89712 flash root partition",
+      offset: (BOOT_PARTITION_SIZE+KERNEL_PARTITION_SIZE)*1024,
+      size: (ROOT_PARTITION_SIZE)*1024 },
+
+    { name: "cdb89712 flash data partition",
+      offset: (BOOT_PARTITION_SIZE+KERNEL_PARTITION_SIZE+ROOT_PARTITION_SIZE)*1024,
+      size: (DATA_PARTITION_SIZE)*1024 },
+
+    { name: "cdb89712 flash free partition",
+      offset: (BOOT_PARTITION_SIZE+KERNEL_PARTITION_SIZE+ROOT_PARTITION_SIZE+DATA_PARTITION_SIZE)*1024 }
+
+};
 
 
 __u8 cdb89712_read8(struct map_info *map, unsigned long ofs)
@@ -106,7 +139,7 @@
 		goto out_resource;
 	}
 
-	flash_mtd = do_map_probe("cfi_probe", &cdb89712_flash_map);
+	flash_mtd = do_map_probe("jedec_probe", &cdb89712_flash_map);
 	if (!flash_mtd) {
 		flash_mtd = do_map_probe("map_rom", &cdb89712_flash_map);
 		if (flash_mtd)
@@ -120,7 +153,7 @@
 
 	flash_mtd->module = THIS_MODULE;
 	
-	if (add_mtd_device(flash_mtd)) {
+	if (add_mtd_partitions(flash_mtd, partition_info, NUM_PARTITIONS )) {
 		printk("FLASH device addition failed\n");
 		err = -ENOMEM;
 		goto out_probe;


--- linux/drivers/net/cs89x0_original.c	Thu May 16 09:34:21 2002
+++ linux/drivers/net/cs89x0.c	Thu May 16 10:15:29 2002
@@ -95,7 +95,7 @@
  * Note that even if DMA is turned off we still support the 'dma' and  'use_dma'
  * module options so we don't break any startup scripts.
  */
-#define ALLOW_DMA	1
+#define ALLOW_DMA	0
 
 /*
  * Set this to zero to remove all the debug statements via
@@ -157,6 +157,10 @@
 static unsigned int netcard_portlist[] __initdata =
    { 0x80090303, 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
 static unsigned int cs8900_irq_map[] = {12,0,0,0};
+#elif defined (CONFIG_ARCH_CDB89712)
+static unsigned int netcard_portlist[] __initdata =
+   { 0xfe000300, 0};
+static unsigned int cs8900_irq_map[] = {7,0,0,0};
 #else
 static unsigned int netcard_portlist[] __initdata =
    { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
@@ -414,12 +418,14 @@
 	}
 printk("PP_addr=0x%x\n", inw(ioaddr + ADD_PORT));
 
+#ifndef CONFIG_ARCH_CDB89712
         if (inw(ioaddr + DATA_PORT) != CHIP_EISA_ID_SIG) {
 		printk(KERN_ERR "%s: incorrect signature 0x%x\n",
 			dev->name, inw(ioaddr + DATA_PORT));
 		retval = -ENODEV;
   		goto out2;
 	}
+#endif
 
 	/* Fill in the 'dev' fields. */
 	dev->base_addr = ioaddr;

--- linux/drivers/net/cs89x0_original.h	Thu May 16 09:56:42 2002
+++ linux/drivers/net/cs89x0.h	Thu May 16 10:01:33 2002
@@ -437,7 +437,11 @@
 #define IRQ_MAP_EEPROM_DATA 0x0046 /*  Offset into eeprom for the IRQ map */
 #define IRQ_MAP_LEN 0x0004 /*  No of bytes to read for the IRQ map */
 #define PNP_IRQ_FRMT 0x0022 /*  PNP small item IRQ format */
+#if defined (CONFIG_ARCH_CDB89712)
+#define CS8900_IRQ_MAP 0xffff /*  This IRQ map is fixed */
+#else
 #define CS8900_IRQ_MAP 0x1c20 /*  This IRQ map is fixed */
+#endif
 
 #define CS8920_NO_INTS 0x0F   /*  Max CS8920 interrupt select # */
 
--- linux/arch/arm/mach-clps711x/Makefile_original	Thu May 16 10:36:52 2002
+++ linux/arch/arm/mach-clps711x/Makefile	Thu May 16 10:37:20 2002
@@ -16,7 +16,7 @@
 obj-n			:=
 obj-			:=
 
-export-objs		:= leds-p720t.o
+export-objs		:= p720t-leds.o
 
 obj-$(CONFIG_ARCH_AUTCPU12) += autcpu12.o
 obj-$(CONFIG_ARCH_CDB89712) += cdb89712.o