qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-08-20 00:09:01 +03:00
Code

Finally fix the rb500 boot (#2436)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9133 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2007-10-05 10:37:35 +00:00
parent 65b5fae711
commit 36c22a7720
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target/linux/rb532/files/arch/mips/rb500/devices.c
View File

@ -151,7 +151,7 @@ void rb500_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
} }
static struct resource nand_slot0_res[] = { static struct resource nand_slot0_res[] = {
{ [0] = {
.name = "nand_membase", .name = "nand_membase",
.flags = IORESOURCE_MEM .flags = IORESOURCE_MEM
} }
@ -163,8 +163,8 @@ struct platform_nand_data rb500_nand_data = {
}; };
static struct platform_device nand_slot0 = { static struct platform_device nand_slot0 = {
.id = 0,
.name = "gen_nand", .name = "gen_nand",
.id = -1,
.resource = nand_slot0_res, .resource = nand_slot0_res,
.num_resources = ARRAY_SIZE(nand_slot0_res), .num_resources = ARRAY_SIZE(nand_slot0_res),
.dev.platform_data = &rb500_nand_data, .dev.platform_data = &rb500_nand_data,
@ -234,6 +234,13 @@ static void __init rb500_nand_setup(void)
changeLatchU5(LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE | LO_WPX); changeLatchU5(LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE | LO_WPX);
else else
changeLatchU5(LO_WPX | LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE); changeLatchU5(LO_WPX | LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE);
/* Setup NAND specific settings */
rb500_nand_data.chip.nr_chips = 1;
rb500_nand_data.chip.nr_partitions = ARRAY_SIZE(rb500_partition_info);
rb500_nand_data.chip.partitions = rb500_partition_info;
rb500_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
rb500_nand_data.chip.options = NAND_NO_AUTOINCR;
} }
@ -248,19 +255,12 @@ static int __init plat_setup_devices(void)
cf_slot0_res[0].end = cf_slot0_res[0].start + 0x1000; cf_slot0_res[0].end = cf_slot0_res[0].start + 0x1000;
} }
/* Initialise the NAND device */
rb500_nand_setup();
/* Read the NAND resources from the device controller */ /* Read the NAND resources from the device controller */
nand_slot0_res[0].start = readl(CFG_DC_DEV2 + CFG_DC_DEVBASE); nand_slot0_res[0].start = readl(CFG_DC_DEV2 + CFG_DC_DEVBASE);
nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000; nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000;
/* Setup NAND specific settings */ /* Initialise the NAND device */
rb500_nand_data.chip.nr_chips = 1; rb500_nand_setup();
rb500_nand_data.chip.nr_partitions = ARRAY_SIZE(rb500_partition_info);
rb500_nand_data.chip.partitions = rb500_partition_info;
rb500_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
rb500_nand_data.chip.options = NAND_NO_AUTOINCR;
return platform_add_devices(rb500_devs, ARRAY_SIZE(rb500_devs)); return platform_add_devices(rb500_devs, ARRAY_SIZE(rb500_devs));
} }

4
target/linux/rb532/files/arch/mips/rb500/prom.c
View File

@ -42,7 +42,7 @@ extern void __init setup_serial_port(void);
unsigned int idt_cpu_freq = 132000000; unsigned int idt_cpu_freq = 132000000;
EXPORT_SYMBOL(idt_cpu_freq); EXPORT_SYMBOL(idt_cpu_freq);
char *board_type; char board_type[11];
EXPORT_SYMBOL(board_type); EXPORT_SYMBOL(board_type);
unsigned int gpio_bootup_state = 0; unsigned int gpio_bootup_state = 0;
EXPORT_SYMBOL(gpio_bootup_state); EXPORT_SYMBOL(gpio_bootup_state);
@ -135,8 +135,8 @@ void __init prom_setup_cmdline(void){
} }
#endif #endif
if (i>0) *(cp++) = ' '; if (i>0) *(cp++) = ' ';
if (strncmp(prom_argv[i], BOARD_TAG, sizeof(BOARD_TAG) - 1) == 0) { if (strncmp(prom_argv[i], BOARD_TAG, sizeof(BOARD_TAG) - 1) == 0) {
board_type = (char *)kzalloc((sizeof(prom_argv[i]) + sizeof(BOARD_TAG) -1), GFP_KERNEL);
strcpy(board_type, prom_argv[i] + sizeof(BOARD_TAG) -1); strcpy(board_type, prom_argv[i] + sizeof(BOARD_TAG) -1);
} }
if (strncmp(prom_argv[i], GPIO_TAG, sizeof(GPIO_TAG) - 1) == 0) { if (strncmp(prom_argv[i], GPIO_TAG, sizeof(GPIO_TAG) - 1) == 0) {