Changeset 9133


Ignore:
Timestamp:
2007-10-05T12:37:35+02:00 (10 years ago)
Author:
florian
Message:

Finally fix the rb500 boot (#2436)

Location:
trunk/target/linux/rb532/files/arch/mips/rb500
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/rb532/files/arch/mips/rb500/devices.c

    r9049 r9133  
    152152 
    153153static struct resource nand_slot0_res[] = { 
    154         { 
     154        [0] = { 
    155155                .name = "nand_membase", 
    156156                .flags = IORESOURCE_MEM 
     
    164164 
    165165static struct platform_device nand_slot0 = { 
    166         .id = 0, 
    167166        .name = "gen_nand", 
     167        .id = -1, 
    168168        .resource = nand_slot0_res, 
    169169        .num_resources = ARRAY_SIZE(nand_slot0_res), 
     
    235235        else 
    236236                changeLatchU5(LO_WPX | LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE); 
     237 
     238        /* Setup NAND specific settings */ 
     239        rb500_nand_data.chip.nr_chips = 1; 
     240        rb500_nand_data.chip.nr_partitions = ARRAY_SIZE(rb500_partition_info); 
     241        rb500_nand_data.chip.partitions = rb500_partition_info; 
     242        rb500_nand_data.chip.chip_delay = NAND_CHIP_DELAY; 
     243        rb500_nand_data.chip.options = NAND_NO_AUTOINCR; 
    237244} 
    238245 
     
    249256        } 
    250257 
    251         /* Initialise the NAND device */ 
    252         rb500_nand_setup(); 
    253  
    254258        /* Read the NAND resources from the device controller */ 
    255259        nand_slot0_res[0].start = readl(CFG_DC_DEV2 + CFG_DC_DEVBASE); 
    256260        nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000; 
    257  
    258         /* Setup NAND specific settings */ 
    259         rb500_nand_data.chip.nr_chips = 1; 
    260         rb500_nand_data.chip.nr_partitions = ARRAY_SIZE(rb500_partition_info); 
    261         rb500_nand_data.chip.partitions = rb500_partition_info; 
    262         rb500_nand_data.chip.chip_delay = NAND_CHIP_DELAY; 
    263         rb500_nand_data.chip.options = NAND_NO_AUTOINCR; 
     261         
     262        /* Initialise the NAND device */ 
     263        rb500_nand_setup(); 
    264264 
    265265        return platform_add_devices(rb500_devs, ARRAY_SIZE(rb500_devs)); 
  • trunk/target/linux/rb532/files/arch/mips/rb500/prom.c

    r9074 r9133  
    4343unsigned int idt_cpu_freq = 132000000; 
    4444EXPORT_SYMBOL(idt_cpu_freq); 
    45 char *board_type; 
     45char board_type[11]; 
    4646EXPORT_SYMBOL(board_type); 
    4747unsigned int gpio_bootup_state = 0; 
     
    136136#endif 
    137137                if (i>0) *(cp++) = ' '; 
     138 
    138139                if (strncmp(prom_argv[i], BOARD_TAG, sizeof(BOARD_TAG) - 1) == 0) { 
    139                         board_type = (char *)kzalloc((sizeof(prom_argv[i]) + sizeof(BOARD_TAG) -1), GFP_KERNEL); 
    140140                        strcpy(board_type, prom_argv[i] + sizeof(BOARD_TAG) -1); 
    141141                } 
Note: See TracChangeset for help on using the changeset viewer.