diff options
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/rdc-2.6/Makefile | 1 | ||||
| -rw-r--r-- | target/linux/rdc-2.6/config/default | 15 | ||||
| -rw-r--r-- | target/linux/rdc-2.6/files/drivers/mtd/maps/imghdr.h | 16 | ||||
| -rw-r--r-- | target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c | 210 | ||||
| -rw-r--r-- | target/linux/rdc-2.6/patches/000-rdc_fixes.patch | 2 | ||||
| -rw-r--r-- | target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch | 56 | ||||
| -rw-r--r-- | target/linux/rdc-2.6/patches/003-rootfstype.patch | 22 |
7 files changed, 160 insertions, 162 deletions
diff --git a/target/linux/rdc-2.6/Makefile b/target/linux/rdc-2.6/Makefile index 616a7e4855..40d6b752b9 100644 --- a/target/linux/rdc-2.6/Makefile +++ b/target/linux/rdc-2.6/Makefile @@ -17,7 +17,6 @@ define Target/Description endef include $(INCLUDE_DIR)/kernel-build.mk -KERNEL_MAKEOPTS += CFLAGS_KERNEL="-DRDC3210_NVRAM_IS_JFFS2=1" # include the profiles -include profiles/*.mk diff --git a/target/linux/rdc-2.6/config/default b/target/linux/rdc-2.6/config/default index 7e7091c905..8b4efe32bc 100644 --- a/target/linux/rdc-2.6/config/default +++ b/target/linux/rdc-2.6/config/default @@ -92,7 +92,6 @@ CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INITRAMFS_SOURCE="" CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_IOSCHED_CFQ=y @@ -181,6 +180,11 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_PNC2000 is not set # CONFIG_MTD_RAM is not set CONFIG_MTD_RDC3210=y +# CONFIG_MTD_RDC3210_STATIC_MAP is not set +CONFIG_MTD_RDC3210_ALLOW_JFFS2=y +# CONFIG_MTD_RDC3210_FACTORY_PRESENT is not set +CONFIG_MTD_RDC3210_SIZE=0x400000 +CONFIG_MTD_RDC3210_BUSWIDTH=2 # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_SC520CDP is not set @@ -194,13 +198,11 @@ CONFIG_MTRR=y # CONFIG_MWINCHIPC6 is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set -# CONFIG_NETFILTER is not set # CONFIG_NET_IPGRE is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_KEY is not set # CONFIG_NET_PKTGEN is not set # CONFIG_NET_RADIO is not set -# CONFIG_NET_SCHED is not set # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NFSD is not set # CONFIG_NFS_FS is not set @@ -289,10 +291,10 @@ CONFIG_X86_MCE=y # CONFIG_X86_MCE_NONFATAL is not set CONFIG_X86_MSR=y # CONFIG_X86_NUMAQ is not set -CONFIG_X86_PC=y +# CONFIG_X86_PC is not set CONFIG_X86_POPAD_OK=y CONFIG_X86_PPRO_FENCE=y -# CONFIG_X86_RDC is not set +CONFIG_X86_RDC=y # CONFIG_X86_REBOOTFIXUPS is not set # CONFIG_X86_SUMMIT is not set # CONFIG_X86_UP_APIC is not set @@ -302,3 +304,6 @@ CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_XADD=y # CONFIG_XFRM_USER is not set # CONFIG_YENTA is not set +CONFIG_INITRAMFS_SOURCE="rootfs" +CONFIG_INITRAMFS_ROOT_UID=0 +CONFIG_INITRAMFS_ROOT_GID=0 diff --git a/target/linux/rdc-2.6/files/drivers/mtd/maps/imghdr.h b/target/linux/rdc-2.6/files/drivers/mtd/maps/imghdr.h index bec8ee7783..7232b70615 100644 --- a/target/linux/rdc-2.6/files/drivers/mtd/maps/imghdr.h +++ b/target/linux/rdc-2.6/files/drivers/mtd/maps/imghdr.h @@ -12,14 +12,14 @@ /* Gemtek */ typedef struct { - UINT8 magic[4]; /* ASICII: GMTK */ - UINT32 checksum; /* CRC32 */ - UINT32 version; /* x.x.x.x */ - UINT32 kernelsz; /* The size of the kernel image */ - UINT32 imagesz; /* The length of this image file ( kernel + romfs + this header) */ - UINT32 pid; /* Product ID */ - UINT32 fastcksum; /* Partial CRC32 on (First(256), medium(256), last(512)) */ - UINT32 reserved; + u8 magic[4]; /* ASICII: GMTK */ + u32 checksum; /* CRC32 */ + u32 version; /* x.x.x.x */ + u32 kernelsz; /* The size of the kernel image */ + u32 imagesz; /* The length of this image file ( kernel + romfs + this header) */ + u32 pid; /* Product ID */ + u32 fastcksum; /* Partial CRC32 on (First(256), medium(256), last(512)) */ + u32 reserved; }gt_imghdr_t; #endif diff --git a/target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c b/target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c index b41d4474d2..cd449bab82 100644 --- a/target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c +++ b/target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c @@ -15,90 +15,14 @@ #include <linux/mtd/partitions.h> #include <linux/autoconf.h> #include <linux/squashfs_fs.h> -#include <linux/jffs2.h> -//#include <linux/crc32.h> - -#define WINDOW_ADDR 0xFFC00000 -#define WINDOW_SIZE 0x00400000 - -#define BUSWIDTH 2 - -/* Dante: linked from linux-2.4.x/drivers/mtd/chips/flashdrv.c */ -extern int flashdrv_get_size(void); -extern int flashdrv_get_sector(int addr); -extern int flashdrv_get_sector_addr(int sector); -extern int flashdrv_get_sector_size(int sector); static struct mtd_info *rdc3210_mtd; -__u8 rdc3210_map_read8(struct map_info *map, unsigned long ofs) -{ - return *(__u8 *)(map->map_priv_1 + ofs); -} - -__u16 rdc3210_map_read16(struct map_info *map, unsigned long ofs) -{ - return *(__u16 *)(map->map_priv_1 + ofs); -} - -__u32 rdc3210_map_read32(struct map_info *map, unsigned long ofs) -{ - return *(__u32 *)(map->map_priv_1 + ofs); -} - -void rdc3210_map_write8(struct map_info *map, __u8 d, unsigned long adr) -{ - *(__u8 *)(map->map_priv_1 + adr) = d; -} - -void rdc3210_map_write16(struct map_info *map, __u16 d, unsigned long adr) -{ - *(__u16 *)(map->map_priv_1 + adr) = d; -} - -void rdc3210_map_write32(struct map_info *map, __u32 d, unsigned long adr) -{ - *(__u32 *)(map->map_priv_1 + adr) = d; -} - -void rdc3210_map_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) -{ - int i; - u16 *dst = (u16 *)(to); - u16 *src = (u16 *)(map->map_priv_1 + from); - - for(i = 0; i < (len / 2); ++i) - dst[i] = src[i]; - - if(len & 1) - { - printk("# WARNNING!!! rdc3210_map_copy_from has odd length\n"); - //dst[len - 1] = B0(src[i]); - } -} - -void rdc3210_map_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) -{ - int i; - u16 *dst = (u16 *)(map->map_priv_1 + to); - u16 *src = (u16 *)(from); - - for(i = 0; i < (len / 2); ++i) - dst[i] = src[i]; - - if(len & 1) - { - printk("# WARNNING!!! rdc3210_map_copy_from has odd length\n"); - //dst[len - 1] = B0(src[i]); - } -} - struct map_info rdc3210_map = { .name = "RDC3210 Flash", - .size = WINDOW_SIZE, - .phys = WINDOW_ADDR, - .bankwidth = BUSWIDTH, + .size = CONFIG_MTD_RDC3210_SIZE, + .bankwidth = CONFIG_MTD_RDC3210_BUSWIDTH, }; /* Dante: This is the default static mapping, however this is nothing but a hint. (Say dynamic mapping) */ @@ -107,7 +31,7 @@ static struct mtd_partition rdc3210_parts[] = { name: "linux", offset: 0, size: 0x003C0000 }, /* 3840 KB = (Kernel + ROMFS) = (768 KB + 3072 KB) */ { name: "romfs", offset: 0x000C0000, size: 0x00300000 }, /* 3072 KB */ { name: "nvram", offset: 0x003C0000, size: 0x00010000 }, /* 64 KB */ -#if RDC3210_STATIC_MAP || RDC3210_FACTORY_PRESENT +#ifdef CONFIG_MTD_RDC3210_FACTORY_PRESENT { name: "factory", offset: 0x003D0000, size: 0x00010000 }, /* 64 KB */ #endif { name: "bootldr", offset: 0x003E0000, size: 0x00020000 }, /* 128 KB */ @@ -250,9 +174,10 @@ static int erase_write (struct mtd_info *mtd, unsigned long pos, static int __init init_rdc3210_map(void) { - printk(KERN_NOTICE "flash device: %x at %x\n", WINDOW_SIZE, WINDOW_ADDR); + rdc3210_map.phys = -rdc3210_map.size; + printk(KERN_NOTICE "flash device: %x at %x\n", rdc3210_map.size, rdc3210_map.phys); - rdc3210_map.map_priv_1 = (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE); + rdc3210_map.map_priv_1 = (unsigned long)(rdc3210_map.virt = ioremap_nocache(rdc3210_map.phys, rdc3210_map.size)); if (!rdc3210_map.map_priv_1) { @@ -260,7 +185,7 @@ static int __init init_rdc3210_map(void) return -EIO; } rdc3210_mtd = do_map_probe("cfi_probe", &rdc3210_map); -#if RDC3210_STATIC_MAP /* Dante: This is for fixed map */ +#ifdef CONFIG_MTD_RDC3210_STATIC_MAP /* Dante: This is for fixed map */ if (rdc3210_mtd) { rdc3210_mtd->module = THIS_MODULE; @@ -273,7 +198,11 @@ static int __init init_rdc3210_map(void) if (rdc3210_mtd) { // Dante - gt_imghdr_t *hdr = (gt_imghdr_t *)(rdc3210_map.map_priv_1), *ptmp; + gt_imghdr_t *hdr = (gt_imghdr_t *)(rdc3210_map.map_priv_1) +#ifdef CONFIG_MTD_RDC3210_ALLOW_JFFS2 + , *ptmp +#endif + ; unsigned int tmp = hdr->kernelsz + sizeof(gt_imghdr_t), tmp2 = rdc3210_mtd->erasesize; unsigned int tmp3 = ((tmp / 32) + ((tmp % 32) ? 1 : 0)) * 32; unsigned int tmp4 = ((tmp / tmp2) + ((tmp % tmp2) ? 1 : 0)) * tmp2; @@ -281,67 +210,81 @@ static int __init init_rdc3210_map(void) if(memcmp(hdr->magic, GTIMG_MAGIC, 4)) { + iounmap((void *)rdc3210_map.map_priv_1); + rdc3210_map.map_priv_1 = 0L; + rdc3210_map.virt = NULL; printk("Invalid MAGIC for Firmware Image!!!\n"); return -EIO; } - -#if 0 +#ifdef CONFIG_MTD_RDC3210_ALLOW_JFFS2 + tmp = (tmp3 == tmp4) ? tmp4 + tmp2 : tmp4; + if ((ptmp = (gt_imghdr_t *)vmalloc(tmp)) == NULL) + { + iounmap((void *)rdc3210_map.map_priv_1); + rdc3210_map.map_priv_1 = 0L; + rdc3210_map.virt = NULL; + printk("Can't allocate 0x%08x for flash-reading buffer!\n", tmp); + return -ENOMEM; + } + if (rdc3210_mtd->read(rdc3210_mtd, 0, tmp, &len, (__u8 *)ptmp) || len != tmp) + { + vfree(ptmp); + iounmap((void *)rdc3210_map.map_priv_1); + rdc3210_map.map_priv_1 = 0L; + rdc3210_map.virt = NULL; + printk("Can't read that much flash! Read 0x%08x of it.\n", len); + return -EIO; + } +#endif +#ifdef CONFIG_MTD_RDC3210_FACTORY_PRESENT /* 1. Adjust Redboot */ - tmp2 = flashdrv_get_size() - rdc3210_parts[4].size; - rdc3210_parts[4].offset = flashdrv_get_sector_addr(flashdrv_get_sector(tmp2)); - rdc3210_parts[4].size = flashdrv_get_size() - rdc3210_parts[4].offset; + tmp = rdc3210_mtd->size - rdc3210_parts[4].size; + rdc3210_parts[4].offset = tmp - (tmp % tmp2); + rdc3210_parts[4].size = rdc3210_mtd->size - rdc3210_parts[4].offset; /* 2. Adjust Factory Default */ - tmp2 -= rdc3210_parts[3].size; - rdc3210_parts[3].offset = flashdrv_get_sector_addr(flashdrv_get_sector(tmp2)); + tmp -= rdc3210_parts[3].size; + rdc3210_parts[3].offset = tmp - (tmp % tmp2); rdc3210_parts[3].size = rdc3210_parts[4].offset - rdc3210_parts[3].offset; +#else /* 1. Adjust Redboot */ - tmp2 = flashdrv_get_size() - rdc3210_parts[3].size; - rdc3210_parts[3].offset = flashdrv_get_sector_addr(flashdrv_get_sector(tmp2)); - rdc3210_parts[3].size = flashdrv_get_size() - rdc3210_parts[3].offset; + tmp = rdc3210_mtd->size - rdc3210_parts[3].size; + rdc3210_parts[3].offset = tmp - (tmp % tmp2); + rdc3210_parts[3].size = rdc3210_mtd->size - rdc3210_parts[3].offset; #endif -#if RDC3210_NVRAM_IS_JFFS2 /* 3. Adjust NVRAM */ - tmp = hdr->reserved; - if (!tmp) tmp = hdr->imagesz; - tmp2 = rdc3210_mtd->erasesize; +#ifdef CONFIG_MTD_RDC3210_ALLOW_JFFS2 + if (*(__u32 *)(((unsigned char *)ptmp)+tmp3) == SQUASHFS_MAGIC) + { + len = 1; + tmp4 = tmp3; + tmp = hdr->imagesz; + rdc3210_parts[2].name = "rootfs"; rdc3210_parts[2].offset = rdc3210_parts[0].offset + (((tmp / tmp2) + ((tmp % tmp2) ? 1 : 0)) * tmp2); - rdc3210_parts[2].size = rdc3210_parts[3].offset - rdc3210_parts[2].offset; - - /* 4. Adjust Linux (Kernel + ROMFS) */ - rdc3210_parts[0].size = rdc3210_parts[3].offset - rdc3210_parts[0].offset; - - /* 5. Adjust ROMFS */ - tmp = hdr->kernelsz + sizeof(gt_imghdr_t); + } + else #else - /* 3. Adjust NVRAM */ - tmp2 -= rdc3210_parts[2].size; - rdc3210_parts[2].offset = flashdrv_get_sector_addr(flashdrv_get_sector(tmp2)); + tmp4 = tmp3; +#endif + { + len = 0; + tmp -= rdc3210_parts[2].size; + rdc3210_parts[2].offset = tmp - (tmp % tmp2); + } rdc3210_parts[2].size = rdc3210_parts[3].offset - rdc3210_parts[2].offset; - + /* 4. Adjust Linux (Kernel + ROMFS) */ - rdc3210_parts[0].size = rdc3210_parts[2].offset - rdc3210_parts[0].offset; + rdc3210_parts[0].size = rdc3210_parts[len + 2].offset - rdc3210_parts[0].offset; /* 5. Adjust ROMFS */ - tmp2 = rdc3210_mtd->erasesize; -#endif - if ((ptmp = (gt_imghdr_t *)kmalloc(tmp4, GFP_KERNEL)) == NULL) - { - iounmap((void *)rdc3210_map.map_priv_1); - return -ENOMEM; - } - if (rdc3210_mtd->read(rdc3210_mtd, 0, tmp4, &len, (__u8 *)ptmp) || len != tmp4) - { - kfree(ptmp); - goto oh_snap; - } - if (*(__u32 *)(((unsigned char *)ptmp)+tmp3) == SQUASHFS_MAGIC) - tmp4 = tmp3; - else if (!hdr->reserved) + rdc3210_parts[1].offset = rdc3210_parts[0].offset + tmp4; + rdc3210_parts[1].size = rdc3210_parts[2].offset - rdc3210_parts[1].offset; +#ifdef CONFIG_MTD_RDC3210_ALLOW_JFFS2 + if (!(hdr->reserved || len)) { __u8 buf[1024]; ptmp->reserved = hdr->imagesz; - ptmp->imagesz = tmp4; + ptmp->imagesz = tmp4; ptmp->checksum = ptmp->fastcksum = 0; memcpy(buf, ptmp, 0x100); memcpy(buf + 0x100, ((__u8 *)ptmp) + ((tmp4 >> 1) - ((tmp4 & 0x6) >> 1)), 0x100); @@ -349,25 +292,27 @@ static int __init init_rdc3210_map(void) ptmp->fastcksum = crc32(buf, sizeof(buf)); ptmp->checksum = crc32((__u8 *)ptmp, tmp4); if (rdc3210_mtd->unlock) rdc3210_mtd->unlock(rdc3210_mtd, 0, tmp2); - if (len == erase_write(rdc3210_mtd, 0, tmp2, (char *)ptmp)) + if ((len = erase_write(rdc3210_mtd, 0, tmp2, (char *)ptmp))) { - kfree(ptmp); + vfree(ptmp); iounmap((void *)rdc3210_map.map_priv_1); + rdc3210_map.map_priv_1 = 0L; + rdc3210_map.virt = NULL; + printk("Couldn't erase! Got %d.\n", len); return len; } if (rdc3210_mtd->sync) rdc3210_mtd->sync(rdc3210_mtd); } - kfree(ptmp); - rdc3210_parts[1].offset = rdc3210_parts[0].offset + tmp4; - rdc3210_parts[1].size = rdc3210_parts[2].offset - rdc3210_parts[1].offset; - + vfree(ptmp); +#endif rdc3210_mtd->owner = THIS_MODULE; add_mtd_partitions(rdc3210_mtd, rdc3210_parts, sizeof(rdc3210_parts)/sizeof(rdc3210_parts[0])); return 0; } #endif -oh_snap: iounmap((void *)rdc3210_map.map_priv_1); + rdc3210_map.map_priv_1 = 0L; + rdc3210_map.virt = NULL; return -ENXIO; } @@ -383,6 +328,7 @@ static void __exit cleanup_rdc3210_map(void) { iounmap((void *)rdc3210_map.map_priv_1); rdc3210_map.map_priv_1 = 0L; + rdc3210_map.virt = NULL; } } diff --git a/target/linux/rdc-2.6/patches/000-rdc_fixes.patch b/target/linux/rdc-2.6/patches/000-rdc_fixes.patch index 7d6fa3af32..140cde9a9b 100644 --- a/target/linux/rdc-2.6/patches/000-rdc_fixes.patch +++ b/target/linux/rdc-2.6/patches/000-rdc_fixes.patch @@ -26,7 +26,7 @@ diff -urN linux-2.6.19/arch/i386/Makefile linux-2.6.19.new/arch/i386/Makefile +# RDC subarch support +mflags-$(CONFIG_X86_RDC) := -Iinclude/asm-i386/mach-generic +mcore-$(CONFIG_X86_RDC) := mach-default -+core-$(CONFIG_X86_RDC) := arch/i386/mach-rdc/ ++core-$(CONFIG_X86_RDC) += arch/i386/mach-rdc/ # default subarch .h files mflags-y += -Iinclude/asm-i386/mach-default diff --git a/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch b/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch index 7411f06816..0c407a114a 100644 --- a/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch +++ b/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch @@ -1,7 +1,7 @@ diff -urN linux-2.6.17/drivers/mtd/maps/Kconfig linux-2.6.17.new/drivers/mtd/maps/Kconfig --- linux-2.6.17/drivers/mtd/maps/Kconfig 2006-06-18 03:49:35.000000000 +0200 +++ linux-2.6.17.new/drivers/mtd/maps/Kconfig 2006-09-24 20:28:11.000000000 +0200 -@@ -76,6 +76,12 @@ +@@ -76,6 +76,50 @@ PNC-2000 is the name of Network Camera product from PHOTRON Ltd. in Japan. It uses CFI-compliant flash. @@ -9,11 +9,49 @@ diff -urN linux-2.6.17/drivers/mtd/maps/Kconfig linux-2.6.17.new/drivers/mtd/map + tristate "CFI Flash device mapped on RDC3210" + depends on X86 && MTD_CFI && MTD_PARTITIONS + help -+ RDC-3210 is the flash device we find on Ralink reference board ++ RDC-3210 is the flash device we find on Ralink reference board. ++ ++config MTD_RDC3210_STATIC_MAP ++ bool "Partitions on RDC3210 mapped statically" if MTD_RDC3210 ++ select MTD_RDC3210_FACTORY_PRESENT ++ help ++ The mapping driver will use the static partition map for the ++ RDC-3210 flash device. ++ ++config MTD_RDC3210_FACTORY_PRESENT ++ bool "Reserve a partition on RDC3210 for factory presets" ++ depends on MTD_RDC3210 ++ default y ++ help ++ The mapping driver will reserve a partition on the RDC-3210 flash ++ device for resetting flash contents to factory defaults. ++ ++config MTD_RDC3210_ALLOW_JFFS2 ++ bool "JFFS2 filesystem usable in a partition on RDC3210" ++ depends on MTD_RDC3210 && !MTD_RDC3210_STATIC_MAP ++ help ++ The mapping driver will align a partition on the RDC-3210 flash ++ device to an erase-block boundary so that a JFFS2 filesystem may ++ reside on it. ++ ++config MTD_RDC3210_SIZE ++ hex "Amount of flash memory on RDC3210" ++ depends on MTD_RDC3210 ++ default "0x400000" ++ help ++ Total size in bytes of the RDC-3210 flash device ++ ++config MTD_RDC3210_BUSWIDTH ++ int "Width of CFI Flash device mapped on RDC3210" ++ depends on MTD_RDC3210 ++ default "2" ++ help ++ Number of bytes addressed on the RDC-3210 flash device before ++ addressing the same chip again + config MTD_SC520CDP tristate "CFI Flash device mapped on AMD SC520 CDP" - depends on X86 && MTD_CFI + depends on X86 && MTD_CFI && MTD_CONCAT diff -urN linux-2.6.17/drivers/mtd/maps/Makefile linux-2.6.17.new/drivers/mtd/maps/Makefile --- linux-2.6.17/drivers/mtd/maps/Makefile 2006-06-18 03:49:35.000000000 +0200 +++ linux-2.6.17.new/drivers/mtd/maps/Makefile 2006-09-24 20:26:10.000000000 +0200 @@ -25,15 +63,3 @@ diff -urN linux-2.6.17/drivers/mtd/maps/Makefile linux-2.6.17.new/drivers/mtd/ma obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o obj-$(CONFIG_MTD_SA1100) += sa1100-flash.o -diff -urN linux-2.6.19/drivers/mtd/redboot.c linux-2.6.19.new/drivers/mtd/redboot.c ---- linux-2.6.19/drivers/mtd/redboot.c 2006-12-18 17:09:14.000000000 +0100 -+++ linux-2.6.19.new/drivers/mtd/redboot.c 2006-12-18 17:14:26.000000000 +0100 -@@ -39,7 +39,7 @@ - return 1; - } - --static int parse_redboot_partitions(struct mtd_info *master, -+int parse_redboot_partitions(struct mtd_info *master, - struct mtd_partition **pparts, - unsigned long fis_origin) - { diff --git a/target/linux/rdc-2.6/patches/003-rootfstype.patch b/target/linux/rdc-2.6/patches/003-rootfstype.patch new file mode 100644 index 0000000000..c0ac6ad3db --- /dev/null +++ b/target/linux/rdc-2.6/patches/003-rootfstype.patch @@ -0,0 +1,22 @@ +--- linux-2.6.19.2/init/do_mounts.c 2007-01-10 11:10:37.000000000 -0800 ++++ foo/init/do_mounts.c 2007-04-05 13:15:37.000000000 -0700 +@@ -243,6 +243,8 @@ + { + char *s = page; + ++ if (!root_fs_names) ++ root_fs_names = "squashfs,jffs2"; + if (root_fs_names) { + strcpy(page, root_fs_names); + while (*s++) { +--- linux-2.6.19.2/init/do_mounts.c 2007-01-10 11:10:37.000000000 -0800 ++++ foo/init/do_mounts.c 2007-04-05 13:15:37.000000000 -0700 +@@ -243,6 +243,8 @@ + { + char *s = page; + ++ if (!root_fs_names) ++ root_fs_names = "squashfs,jffs2"; + if (root_fs_names) { + strcpy(page, root_fs_names); + while (*s++) { |