[kirkwood] Use kirkwood_nand_init instead of manually registering the nand driver

[openwrt.git] / target / linux / ramips / files / arch / mips / ralink / common / prom.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/common/prom.c b/target/linux/ramips/files/arch/mips/ralink/common/prom.c
index 154d5f9..b207b66 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/common/prom.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/prom.c
@@ -20,33 +20,6 @@
 #include <asm/mach-ralink/machine.h>
 #include <ralink_soc.h>
 
 #include <asm/mach-ralink/machine.h>
 #include <ralink_soc.h>
 

-struct board_rec {
-       char                    *name;
-       enum ramips_mach_type   mach_type;
-};
-
-static struct board_rec boards[] __initdata = {
-       {
-               .name           = "RT-N15",
-               .mach_type      = RAMIPS_MACH_RT_N15,
-       }, {
-               .name           = "WZR-AGL300NH",
-               .mach_type      = RAMIPS_MACH_WZR_AGL300NH,
-       }, {
-               .name           = "DIR-300-revB",
-               .mach_type      = RAMIPS_MACH_DIR_300_REVB,
-       }, {
-               .name           = "V22RW-2X2",
-               .mach_type      = RAMIPS_MACH_V22RW_2X2,
-       }, {
-               .name           = "WHR-G300N",
-               .mach_type      = RAMIPS_MACH_WHR_G300N,
-       }, {
-               .name           = "FONERA20N",
-               .mach_type      = RAMIPS_MACH_FONERA20N,
-       }
-};
-

 static inline void *to_ram_addr(void *addr)
 {
        u32 base;
 static inline void *to_ram_addr(void *addr)
 {
        u32 base;


@@ -73,7 +46,7 @@ static inline void *to_ram_addr(void *addr)
 static void __init prom_append_cmdline(const char *name,
                                       const char *value)
 {
 static void __init prom_append_cmdline(const char *name,
                                       const char *value)
 {

-       char buf[CL_SIZE];
+       char buf[COMMAND_LINE_SIZE];

 
        snprintf(buf, sizeof(buf), " %s=%s", name, value);
        strlcat(arcs_cmdline, buf, sizeof(arcs_cmdline));
 
        snprintf(buf, sizeof(buf), " %s=%s", name, value);
        strlcat(arcs_cmdline, buf, sizeof(arcs_cmdline));


@@ -164,20 +137,6 @@ static __init char *prom_append_env(char **env, const char *envname)
 #undef PROM_MAX_ENVS
 }
 
 #undef PROM_MAX_ENVS
 }
 

-static __init int ramips_board_setup(char *name)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(boards); i++)
-               if (strcmp(name, boards[i].name) == 0) {
-                       ramips_mach = boards[i].mach_type;
-                       break;
-               }
-
-       return 1;
-}
-__setup("board=", ramips_board_setup);
-

 void __init prom_init(void)
 {
        int argc;
 void __init prom_init(void)
 {
        int argc;