diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-11 19:05:56 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-03-11 19:05:56 +0000 |
| commit | ea8fa1a9f18312af2012425217d520d8ecb44841 (patch) | |
| tree | e6992194aa267fc8e67bdb1985860631c687d7c0 /target/linux/ramips/files/arch/mips/ralink/common | |
| parent | ef72092022bd4d893ec52b662fd809f045933c67 (diff) | |
| download | upstream-ea8fa1a9f18312af2012425217d520d8ecb44841.tar.gz upstream-ea8fa1a9f18312af2012425217d520d8ecb44841.tar.bz2 upstream-ea8fa1a9f18312af2012425217d520d8ecb44841.zip | |
ramips: replace RALINK_SOC_* macros with global variables
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30888 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/files/arch/mips/ralink/common')
| -rw-r--r-- | target/linux/ramips/files/arch/mips/ralink/common/prom.c | 17 | ||||
| -rw-r--r-- | target/linux/ramips/files/arch/mips/ralink/common/setup.c | 5 |
2 files changed, 12 insertions, 10 deletions
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 d3f884b844..26169d366d 100644 --- 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 <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; - base = KSEG0ADDR(RALINK_SOC_SDRAM_BASE); + base = KSEG0ADDR(ramips_mem_base); if (((u32) addr > base) && - ((u32) addr < (base + RALINK_SOC_MEM_SIZE_MAX))) + ((u32) addr < (base + ramips_mem_size_max))) return addr; - base = KSEG1ADDR(RALINK_SOC_SDRAM_BASE); + base = KSEG1ADDR(ramips_mem_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 */ - base = RALINK_SOC_SDRAM_BASE; + base = ramips_mem_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; diff --git a/target/linux/ramips/files/arch/mips/ralink/common/setup.c b/target/linux/ramips/files/arch/mips/ralink/common/setup.c index 5f7cf14a76..0d6b8d8c90 100644 --- a/target/linux/ramips/files/arch/mips/ralink/common/setup.c +++ b/target/linux/ramips/files/arch/mips/ralink/common/setup.c @@ -19,7 +19,6 @@ #include <asm/mach-ralink/common.h> #include <asm/mach-ralink/machine.h> -#include <ralink_soc.h> unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN]; @@ -34,13 +33,13 @@ static void __init detect_mem_size(void) void *base; base = (void *) KSEG1ADDR(detect_mem_size); - for (size = RALINK_SOC_MEM_SIZE_MIN; size < RALINK_SOC_MEM_SIZE_MAX; + for (size = ramips_mem_size_min; size < ramips_mem_size_max; size <<= 1 ) { if (!memcmp(base, base + size, 1024)) break; } - add_memory_region(RALINK_SOC_SDRAM_BASE, size, BOOT_MEM_RAM); + add_memory_region(ramips_mem_base, size, BOOT_MEM_RAM); } void __init ramips_early_serial_setup(int line, unsigned base, unsigned freq, |