From d132290e01ea2f7e6dff534e9b746fbfdd5bb70d Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 5 Oct 2007 10:38:33 +0000 Subject: [PATCH] Backport the routerboad detection to 7.09 SVN-Revision: 9134 --- target/linux/rb532-2.6/files/arch/mips/rb500/prom.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/linux/rb532-2.6/files/arch/mips/rb500/prom.c b/target/linux/rb532-2.6/files/arch/mips/rb500/prom.c index 1978b0f17c..222bfe2d23 100644 --- a/target/linux/rb532-2.6/files/arch/mips/rb500/prom.c +++ b/target/linux/rb532-2.6/files/arch/mips/rb500/prom.c @@ -42,7 +42,7 @@ extern void __init setup_serial_port(void); unsigned int idt_cpu_freq = 132000000; EXPORT_SYMBOL(idt_cpu_freq); -unsigned int board_type = 500; +char board_type[11]; EXPORT_SYMBOL(board_type); unsigned int gpio_bootup_state = 0; EXPORT_SYMBOL(gpio_bootup_state); @@ -103,9 +103,9 @@ void __init prom_init(void) add_memory_region(ddr->ddrbase + 0x400, memsize - 0x600, BOOT_MEM_RAM); } -void prom_free_prom_memory(void) +void __init prom_free_prom_memory(void) { - /* FIXME: STUB */ + /* No prom memory to free */ } extern char _image_cmdline; @@ -135,8 +135,9 @@ void __init prom_setup_cmdline(void){ } #endif if (i>0) *(cp++) = ' '; + if (strncmp(prom_argv[i], BOARD_TAG, sizeof(BOARD_TAG) - 1) == 0) { - board_type = simple_strtoul(prom_argv[i] + sizeof(BOARD_TAG) - 1, 0, 10); + strcpy(board_type, prom_argv[i] + sizeof(BOARD_TAG) -1); } if (strncmp(prom_argv[i], GPIO_TAG, sizeof(GPIO_TAG) - 1) == 0) { gpio_bootup_state = simple_strtoul(prom_argv[i] + sizeof(GPIO_TAG) - 1, 0, 10); -- 2.30.2