Changeset 10035

Timestamp:

07/29/08 18:01:09 (5 years ago)

Author:

BrainSlayer

Message:

correct flashmap and kernel config

Location:

src/linux/sl2312/linux-2.6.23

Files:

• .config_storm (modified) (5 diffs)
• Makefile (modified) (1 diff)
• drivers/mtd/maps/sl2312-flash-cfi.c (modified) (4 diffs)
• drivers/mtd/maps/sl2312_flashmap.h (modified) (1 diff)

src/linux/sl2312/linux-2.6.23/.config_storm

@@ -2 +2 @@
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23.17
-# Thu Jul 24 15:50:53 2008
+# Tue Jul 29 15:18:19 2008
 #
 CONFIG_ARM=y
@@ -210 +210 @@
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock5 rootfstype=squashfs noinitrd"
+CONFIG_CMDLINE="console=ttyS0,19200 root=/dev/mtdblock5 rootfstype=squashfs noinitrd"
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
@@ -545 +545 @@
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3
-CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
@@ -598 +595 @@
 # Mapping drivers for chip access
 #
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x0
-CONFIG_MTD_PHYSMAP_LEN=0x0
-CONFIG_MTD_PHYSMAP_BANKWIDTH=0
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
 # CONFIG_MTD_ARM_INTEGRATOR is not set
-# CONFIG_MTD_PCI is not set
 # CONFIG_MTD_PLATRAM is not set
 CONFIG_MTD_SL2312_CFI=y
@@ -1030 +1023 @@
 CONFIG_PROC_SYSCTL=y
 CONFIG_DEVFS_FS=y
-CONFIG_DEVFS_MOUNT=y
+# CONFIG_DEVFS_MOUNT is not set
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_SYSFS=y

src/linux/sl2312/linux-2.6.23/Makefile

@@ -182 +182 @@
 
 ARCH            = $(SUBARCH)
-CROSS_COMPILE   = arm-linux-uclibc-
+CROSS_COMPILE   = armeb-linux-uclibc-
 
 # Architecture as present in compile.h

src/linux/sl2312/linux-2.6.23/drivers/mtd/maps/sl2312-flash-cfi.c

@@ -34 +34 @@
 #include <linux/mtd/kvctl.h>
 #include "sl2312_flashmap.h"
+#include <linux/squashfs_fs.h>
 
 
@@ -130 +131 @@
         int nr_parts = 0;
         int ret;
+        char *buf;
+        unsigned char *p;
+        int offset=0;
 #ifndef CONFIG_SL2312_SHARE_PIN
     unsigned int    reg_val;
@@ -169 +173 @@
 //      simple_map_init(&sl2312flash_map);
 
+    printk("probe cfi\n");
         mtd = do_map_probe("cfi_probe", &sl2312flash_map);
         if (!mtd)
@@ -182 +187 @@
 //    mtd->write = flash_write;
 
-    parts = sl2312_partitions;
+    printk("scan for squashfs\n");
+       parts = sl2312_partitions;
         nr_parts = sizeof(sl2312_partitions)/sizeof(*parts);
+        buf = sl2312flash_map.virt;
+        int erasesize = mtd->erasesize;
+        int filesyssize=0;
+        int tmplen=0;
+        while((offset+erasesize)<mtd->size)
+            {
+            printk(KERN_EMERG "[0x%08X]\n",offset);
+            if (*((__u32 *) buf) == SQUASHFS_MAGIC) 
+                {
+                struct squashfs_super_block *sb = (struct squashfs_super_block *) buf;
+                if (*((__u16 *) buf))
+                        {
+                        filesyssize = sb->bytes_used;
+                        tmplen = offset + filesyssize;
+                        tmplen +=  (erasesize - 1);
+                        tmplen &= ~(erasesize - 1);
+                        filesyssize = tmplen - offset;
+                        }
+                parts[2].size = filesyssize;
+                parts[2].offset = offset;
+                parts[3].size = parts[1].size-filesyssize;
+                parts[3].offset = offset+filesyssize;
+                break;
+                }
+            offset+=erasesize;
+            buf+=erasesize;
+            }
+
         ret = add_mtd_partitions(mtd, parts, nr_parts);
         /*If we got an error, free all resources.*/

src/linux/sl2312/linux-2.6.23/drivers/mtd/maps/sl2312_flashmap.h

@@ -13 +13 @@
 static struct mtd_partition sl2312_partitions[] = {
         { name: "RedBoot",       offset: 0x00000000, size: 0x00020000, },
-        { name: "kernel",        offset: 0x00020000, size: 0x00100000, },
-        { name: "rootfs",        offset: 0x00120000, size: 0x00500000, },
-        { name: "rootfs_data",   offset: 0x00620000, size: 0x001A0000, },
-        { name: "VCTL",          offset: 0x007C0000, size: 0x00010000, },
-        { name: "cfg",           offset: 0x007D0000, size: 0x00020000, },
+        { name: "linux",         offset: 0x00020000, size: 0x00760000, },
+        { name: "rootfs",        offset: 0x00000000, size: 0x00000000, }, // variable size
+        { name: "ddwrt",         offset: 0x00000000, size: 0x00000000, }, // variable size
+        { name: "nvram",         offset: 0x007E0000, size: 0x00010000, },
         { name: "FIS directory", offset: 0x007F0000, size: 0x00010000, }
 };