--- zzzz-none-000/linux-2.6.19.2/arch/arm/kernel/setup.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/arm/kernel/setup.c	2008-01-29 16:04:34.000000000 +0000
@@ -21,8 +21,10 @@
 #include <linux/init.h>
 #include <linux/root_dev.h>
 #include <linux/cpu.h>
+#include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/smp.h>
+#include <linux/env.h>
 
 #include <asm/cpu.h>
 #include <asm/elf.h>
@@ -36,6 +38,19 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
+/*------------------------------------------------------------------------------------------*\
+\*------------------------------------------------------------------------------------------*/
+#include <asm/io.h>
+#include <asm/arch/io.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/gpio.h>
+#if defined(CONFIG_ARCH_DAVINCI)
+#include <asm/arch/hw_control.h>
+#include <video/davincifb.h>
+#endif /*--- #if defined(CONFIG_ARCH_DAVINCI) ---*/
+/*------------------------------------------------------------------------------------------*\
+\*------------------------------------------------------------------------------------------*/
+
 #include "compat.h"
 
 #ifndef MEM_SIZE
@@ -103,17 +118,22 @@
 unsigned long phys_initrd_start __initdata = 0;
 unsigned long phys_initrd_size __initdata = 0;
 
-static struct meminfo meminfo __initdata = { 0, };
+static struct meminfo meminfo __initdata = { 0 };
 static const char *cpu_name;
 static const char *machine_name;
 static char command_line[COMMAND_LINE_SIZE];
 
+char *getcmdline(void) {
+    return command_line;
+}
+
 static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
 static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } };
 #define ENDIANNESS ((char)endian_test.l)
 
 DEFINE_PER_CPU(struct cpuinfo_arm, cpu_data);
 
+int *pEnvironment;
 /*
  * Standard memory resources
  */
@@ -357,9 +377,6 @@
 #ifndef CONFIG_VFP
 	elf_hwcap &= ~HWCAP_VFP;
 #endif
-#ifndef CONFIG_IWMMXT
-	elf_hwcap &= ~HWCAP_IWMMXT;
-#endif
 
 	cpu_proc_init();
 }
@@ -565,7 +582,7 @@
 
 		if (kernel_code.start >= res->start &&
 		    kernel_code.end <= res->end)
-			request_resource(res, &kernel_code);
+		    request_resource(res, &kernel_code);
 		if (kernel_data.start >= res->start &&
 		    kernel_data.end <= res->end)
 			request_resource(res, &kernel_data);
@@ -701,12 +718,21 @@
 
 static int __init parse_tag_cmdline(const struct tag *tag)
 {
-	strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
+	strlcat(default_command_line, " ", COMMAND_LINE_SIZE - strlen(default_command_line) - 1);
+	strlcat(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE - strlen(default_command_line) - 1);
 	return 0;
 }
 
 __tagtable(ATAG_CMDLINE, parse_tag_cmdline);
 
+static int __init parse_tag_envp(const struct tag *tag)
+{
+    pEnvironment = (int *)tag->u.envp.envp;
+    return 0;
+}
+
+__tagtable(ATAG_ENVP, parse_tag_envp);
+
 /*
  * Scan the tag table for this tag, and call its parse function.
  * The tag table is built by the linker from all the __tagtable
@@ -767,11 +793,96 @@
 }
 arch_initcall(customize_machine);
 
+/*------------------------------------------------------------------------------------------*\
+\*------------------------------------------------------------------------------------------*/
+unsigned int davinci_revision[5] = { 123, 0, 0, 0, 0 };
+EXPORT_SYMBOL(davinci_revision);
+
+/*------------------------------------------------------------------------------------------*\
+\*------------------------------------------------------------------------------------------*/
+static int hw_revision_setup(char *ptr) {
+    unsigned int i = 0;
+    unsigned int my_atoi(char *p);
+    printk("[hw_revision_setup] str=\"%s\"\n", ptr);
+    while(ptr && *ptr) {
+        printk("[hw_revision_setup] HWRevision: %s\n", ptr);
+        davinci_revision[i++] = my_atoi(ptr);
+        ptr = strchr(ptr, '.');
+        if(ptr) {
+            ptr++;
+            if(*ptr == ' ')
+                break;
+        }
+        if(i >= sizeof(davinci_revision) / sizeof(davinci_revision[0]))
+            break;
+    }
+    return 0;
+}
+
+/*------------------------------------------------------------------------------------------*\
+ * zuerst suchen wir das Ende des Filesystems - auf der 8020 wird es in den RAM geladen
+ * dahinter können wir dem Kernel weiteren Speicher zuordnen
+ * wenn das Filesystem ins RAM geladen wurde wird ein neuer Memorybereich hinzugefügt,
+ * ansonsten wird nur die size des bereits eingerichteten angepasst
+\*------------------------------------------------------------------------------------------*/
+#if defined(CONFIG_ARCH_DAVINCI)       /*--- wir haben 8MB mehr Speicher als im Urlader angegeben ---*/
+static int __init davinci_add_memory(unsigned int size) {
+
+    char buffer[32];
+    char *pstr;
+    unsigned int start, end;
+    unsigned int my_atoi(char *p);
+
+    memset(buffer, 0, 32);
+    if (strstr(saved_command_line, "mtdram1=")) {
+        pstr = strstr(saved_command_line, "mtdram1=") + sizeof("mtdram1=") - 1;
+        memcpy(buffer, pstr, sizeof("0x80000000,0x80000000"));
+        pstr = buffer;
+        /*--- printk("[davinci_move_filesystem] pstr %s\n", pstr); ---*/
+        start = my_atoi(pstr);
+        pstr = strchr(pstr, ',') + 1;
+        /*--- printk("[davinci_move_filesystem] pstr %s\n", pstr); ---*/
+        end = my_atoi(pstr);
+        /*--- printk("[davinci_move_filesystem] start 0x%x end 0x%x\n", start, end); ---*/
+        
+        arm_add_memory(end, size);
+        return 1;
+    }
+    return 0;
+}
+
+static void __init davinci_change_memory(unsigned int size) {
+
+    if (meminfo.nr_banks == 1) {            /*--- wir haben nur einen Memorybereich eingetragen ---*/
+        meminfo.bank[0].size += size;
+    }
+
+}
+
+static unsigned int __init search_fb_memory(void) {
+
+    unsigned int address = inl(OSD_OSDWIN0ADR);
+
+    if (!address) {
+        printk("[search_fb_memory] <ERROR: no memory found> 0x%x 0x%x 0x%x 0x%x \n", 
+                inl(OSD_VIDWIN0ADR), inl(OSD_VIDWIN1ADR), inl(OSD_OSDWIN0ADR), inl(OSD_OSDWIN1ADR));
+    }
+
+    return address;
+
+}
+
+#endif
+
+extern unsigned int davincifb_base_address;
+/*------------------------------------------------------------------------------------------*\
+\*------------------------------------------------------------------------------------------*/
 void __init setup_arch(char **cmdline_p)
 {
 	struct tag *tags = (struct tag *)&init_tags;
 	struct machine_desc *mdesc;
 	char *from = default_command_line;
+    void set_flash_architecture(unsigned paged);
 
 	setup_processor();
 	mdesc = setup_machine(machine_arch_type);
@@ -809,7 +920,22 @@
 	memcpy(saved_command_line, from, COMMAND_LINE_SIZE);
 	saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
 	parse_cmdline(cmdline_p, from);
+
+#if defined(CONFIG_ARCH_DAVINCI)       
+    if (!davinci_add_memory(16<<20))            /*--- wir haben 16MB mehr Speicher als im Urlader angegeben ---*/
+        davinci_change_memory(16<<20);
+#endif
+
 	paging_init(&meminfo, mdesc);
+
+#if defined(CONFIG_ARCH_DAVINCI)       
+    davincifb_base_address = search_fb_memory();
+
+    /*--- jeder FRAME-Buffer muss 4k aligned sein - also maximal 16k zusaetzlich reservieren ---*/
+    if (davincifb_base_address)
+        reserve_bootmem(davincifb_base_address, (OSD0_FB_SIZE+OSD1_FB_SIZE+VID0_FB_SIZE+VID1_FB_SIZE+((4*4)<<10)));
+#endif
+
 	request_standard_resources(&meminfo, mdesc);
 
 #ifdef CONFIG_SMP
@@ -832,6 +958,76 @@
 	conswitchp = &dummy_con;
 #endif
 #endif
+    /*--- das Environment kann erst initialisiert werden, wenn das Memorymapping eingerichtet ist ---*/
+#if defined(CONFIG_ARCH_DAVINCI)
+    if(strstr(saved_command_line, "HWRevision=")) { 
+        hw_revision_setup(strstr(saved_command_line, "HWRevision=") + sizeof("HWRevision=") - 1);
+    }
+
+#ifdef CONFIG_MTD_COMPLEX_MAPPINGS 
+    if(davinci_revision[1] == 1) {
+        struct gpio_controller *GPIO = (struct gpio_controller *)IO_ADDRESS(DAVINCI_GPIO_BASE);
+        int i, *pi;
+        static struct resource my_gpio_resource[4] = {
+            {
+                .name = "flash A20",
+                .start = CONFIG_MTD_PAGED_BIT_A20,
+                .end   = CONFIG_MTD_PAGED_BIT_A20,
+                .flags = IORESOURCE_IO		
+            },
+            {
+                .name = "flash A21",
+                .start = CONFIG_MTD_PAGED_BIT_A21,
+                .end   = CONFIG_MTD_PAGED_BIT_A21,
+                .flags = IORESOURCE_IO		
+            },
+            {
+                .name = "flash A22",
+                .start = CONFIG_MTD_PAGED_BIT_A22,
+                .end   = CONFIG_MTD_PAGED_BIT_A22,
+                .flags = IORESOURCE_IO		
+            },
+            {
+                .name = "flash A23",
+                .start = CONFIG_MTD_PAGED_BIT_A23,
+                .end   = CONFIG_MTD_PAGED_BIT_A23,
+                .flags = IORESOURCE_IO		
+            }
+        };
+        for(i = 0 ; i < 4 ; i++) {
+            if(request_resource(&gpio_resource, &my_gpio_resource[i]))
+                printk(KERN_ERR "ERROR: mapped flash: gpio %u not available\n", my_gpio_resource[i].start);
+        }
+
+        set_flash_architecture(1);
+        /*--- board_setup_gpio("neue hardware", 4); ---*/
+        davinci_gpio_ctrl(CONFIG_MTD_PAGED_BIT_A20, GPIO_PIN, GPIO_OUTPUT_PIN);
+        davinci_gpio_ctrl(CONFIG_MTD_PAGED_BIT_A21, GPIO_PIN, GPIO_OUTPUT_PIN);
+        davinci_gpio_ctrl(CONFIG_MTD_PAGED_BIT_A22, GPIO_PIN, GPIO_OUTPUT_PIN);
+        davinci_gpio_ctrl(CONFIG_MTD_PAGED_BIT_A23, GPIO_PIN, GPIO_OUTPUT_PIN);
+
+        GPIO->clr_data =
+                (1 << CONFIG_MTD_PAGED_BIT_A20) |
+                (1 << CONFIG_MTD_PAGED_BIT_A21) |
+                (1 << CONFIG_MTD_PAGED_BIT_A22) |
+                (1 << CONFIG_MTD_PAGED_BIT_A23);
+
+        pi = (int *)EMIF_ADDRESS(0x02000000);
+        for(i = 0 ; i < 32 ; i++, pi++) {
+            printk("0x%p: 0x%x\n", pi, *pi);
+        }
+        env_init(phys_to_virt((unsigned long)pEnvironment), ENV_LOCATION_PHY_RAM);
+
+        gpio_control_hw(scart_sig_on, 1);
+        gpio_control_hw(scart_signal_rgb, 1);
+
+        return;
+    }
+#endif /*--- #ifdef CONFIG_MTD_COMPLEX_MAPPINGS ---*/ 
+
+    set_flash_architecture(0);
+#endif /*--- #if defined(CONFIG_ARCH_DAVINCI) ---*/
+    env_init((unsigned int *)phys_to_virt((unsigned long)pEnvironment), ENV_LOCATION_FLASH);
 }
 
 
@@ -857,7 +1053,6 @@
 	"vfp",
 	"edsp",
 	"java",
-	"iwmmxt",
 	NULL
 };