[package] libpcap: explicitely disable libnl support to prevent different build resul...

[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 fdbcb79..26169d3 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/common/prom.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/prom.c
@@ -18,26 +18,29 @@
 
 #include <asm/mach-ralink/common.h>
 #include <asm/mach-ralink/machine.h>
 
 #include <asm/mach-ralink/common.h>
 #include <asm/mach-ralink/machine.h>

-#include <ralink_soc.h>
+
+unsigned long ramips_mem_base;
+unsigned long ramips_mem_size_min;
+unsigned long ramips_mem_size_max;

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

-       base = KSEG0ADDR(RALINK_SOC_SDRAM_BASE);
+       base = KSEG0ADDR(ramips_mem_base);

        if (((u32) addr > base) &&
        if (((u32) addr > base) &&

-           ((u32) addr < (base + RALINK_SOC_MEM_SIZE_MAX)))
+           ((u32) addr < (base + ramips_mem_size_max)))

                return addr;
 
                return addr;
 

-       base = KSEG1ADDR(RALINK_SOC_SDRAM_BASE);
+       base = KSEG1ADDR(ramips_mem_base);

        if (((u32) addr > base) &&
        if (((u32) addr > base) &&

-           ((u32) addr < (base + RALINK_SOC_MEM_SIZE_MAX)))
+           ((u32) addr < (base + ramips_mem_size_max)))

                return addr;
 
        /* some U-Boot variants uses physical addresses */
                return addr;
 
        /* some U-Boot variants uses physical addresses */

-       base = RALINK_SOC_SDRAM_BASE;
+       base = ramips_mem_base;

        if (((u32) addr > base) &&
        if (((u32) addr > base) &&

-           ((u32) addr < (base + RALINK_SOC_MEM_SIZE_MAX)))
+           ((u32) addr < (base + ramips_mem_size_max)))

                return (void *)KSEG0ADDR(addr);
 
        return NULL;
                return (void *)KSEG0ADDR(addr);
 
        return NULL;


@@ -143,6 +146,8 @@ void __init prom_init(void)
        char **envp;
        char **argv;
 
        char **envp;
        char **argv;
 

+       ramips_soc_prom_init();
+

        printk(KERN_DEBUG
               "prom: fw_arg0=%08x, fw_arg1=%08x, fw_arg2=%08x, fw_arg3=%08x\n",
               (unsigned int)fw_arg0, (unsigned int)fw_arg1,
        printk(KERN_DEBUG
               "prom: fw_arg0=%08x, fw_arg1=%08x, fw_arg2=%08x, fw_arg3=%08x\n",
               (unsigned int)fw_arg0, (unsigned int)fw_arg1,