Changeset 18327


Ignore:
Timestamp:
2009-11-06T11:53:15+01:00 (8 years ago)
Author:
florian
Message:

[rdc] provide the correct flash mapping on non airlink devices, remove the rootfs_type hacks, patch from sn9

Location:
trunk/target/linux/rdc
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/rdc/config-2.6.30

    r18325 r18327  
    3636# CONFIG_CC_STACKPROTECTOR is not set 
    3737CONFIG_CLOCKSOURCE_WATCHDOG=y 
    38 CONFIG_CMDLINE="console=ttyS0,38400" 
     38CONFIG_CMDLINE="console=ttyS0,38400 rootfstype=squashfs,jffs2" 
    3939CONFIG_CMDLINE_BOOL=y 
    4040# CONFIG_CMDLINE_OVERRIDE is not set 
     
    192192# CONFIG_MTD_COMPLEX_MAPPINGS is not set 
    193193# CONFIG_MTD_NETSC520 is not set 
     194CONFIG_MTD_PHYSMAP=y 
    194195# CONFIG_MTD_R8610 is not set 
    195 CONFIG_MTD_RDC3210=y 
    196 CONFIG_MTD_RDC3210_ALLOW_JFFS2=y 
    197 CONFIG_MTD_RDC3210_BUSWIDTH=2 
    198 # CONFIG_MTD_RDC3210_FACTORY_PRESENT is not set 
    199 CONFIG_MTD_RDC3210_SIZE=0x400000 
    200 # CONFIG_MTD_RDC3210_STATIC_MAP is not set 
     196# CONFIG_MTD_RDC3210 is not set 
    201197# CONFIG_MTD_TS5500 is not set 
    202198# CONFIG_MTRR is not set 
  • trunk/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c

    r18276 r18327  
    22 *  Generic RDC321x platform devices 
    33 * 
    4  *  Copyright (C) 2007-2008 OpenWrt.org 
     4 *  Copyright (C) 2007-2009 OpenWrt.org 
    55 *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org> 
    6  *  Copyright (C) 2008 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> 
     6 *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> 
    77 * 
    88 *  This program is free software; you can redistribute it and/or 
     
    158158#ifndef CONFIG_MTD_RDC3210 
    159159        struct map_info rdc_map_info; 
    160         u32 the_header[4]; 
     160        u32 the_header[8]; 
    161161 
    162162        ROOT_DEV = 0; 
     
    182182        the_header[3] = ((u32 *)rdc_map_info.virt)[3]; 
    183183        iounmap(rdc_map_info.virt); 
     184        rdc_map_info.virt = ioremap_nocache(rdc_map_info.phys + 0x8000, 0x10); 
     185        if (rdc_map_info.virt == NULL) 
     186                panic("Could not ioremap to read device magic!"); 
     187        the_header[4] = ((u32 *)rdc_map_info.virt)[0]; 
     188        the_header[5] = ((u32 *)rdc_map_info.virt)[1]; 
     189        the_header[6] = ((u32 *)rdc_map_info.virt)[2]; 
     190        the_header[7] = ((u32 *)rdc_map_info.virt)[3]; 
     191        iounmap(rdc_map_info.virt); 
    184192        if (!memcmp(the_header, "GMTK", 4)) {   /* Gemtek */ 
    185193                /* TODO */ 
    186         } else if (!memcmp(the_header, "CSYS", 4)) {    /* Sitecom */ 
    187                 /* TODO */ 
     194        } else if (!memcmp(the_header + 4, "CSYS", 4)) {        /* Sitecom */ 
     195                rdc_flash_parts[0].name = "system"; 
     196                rdc_flash_parts[0].offset = 0; 
     197                rdc_flash_parts[0].size = rdc_map_info.size - 0x10000; 
     198                rdc_flash_parts[1].name = "config"; 
     199                rdc_flash_parts[1].offset = 0; 
     200                rdc_flash_parts[1].size = 0x8000; 
     201                rdc_flash_parts[2].name = "magic"; 
     202                rdc_flash_parts[2].offset = 0x8000; 
     203                rdc_flash_parts[2].size = 0x14; 
     204                rdc_flash_parts[3].name = "kernel"; 
     205                rdc_flash_parts[3].offset = 0x8014; 
     206                rdc_flash_parts[3].size = the_header[5]; 
     207                rdc_flash_parts[4].name = "rootfs"; 
     208                rdc_flash_parts[4].offset = 0x8014 + the_header[5]; 
     209                rdc_flash_parts[4].size = rdc_flash_parts[0].size - rdc_flash_parts[4].offset; 
     210                rdc_flash_parts[5].name = "bootloader"; 
     211                rdc_flash_parts[5].offset = rdc_flash_parts[0].size; 
     212                rdc_flash_parts[5].size = 0x10000; 
     213                rdc_flash_data.nr_parts = 6; 
    188214        } else if (!memcmp(((u8 *)the_header) + 14, "Li", 2)) { /* AMIT */ 
    189215                rdc_flash_parts[0].name = "kernel_parthdr"; 
Note: See TracChangeset for help on using the changeset viewer.