qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

ramips: replace RALINK_SOC_* macros with global variables

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30888 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg
2012-03-11 19:05:56 +00:00
parent 9fb8ca891c
commit 5a2708d192
10 changed files with 30 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
target/linux/ramips/files/arch/mips/ralink/common/prom.c
View File

@@ -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;

5
target/linux/ramips/files/arch/mips/ralink/common/setup.c
View File

@@ -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,

4
target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c
View File

@@ -42,6 +42,10 @@ void __init ramips_soc_prom_init(void)
(char) ((n1 >> 16) & 0xff), (char) ((n1 >> 24) & 0xff),
(id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
(id & CHIP_ID_REV_MASK));
ramips_mem_base = RT2880_SDRAM_BASE;
ramips_mem_size_min = RT288X_MEM_SIZE_MIN;
ramips_mem_size_max = RT288X_MEM_SIZE_MAX;
}
static struct ramips_gpio_chip rt288x_gpio_chips[] = {

4
target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
View File

@@ -42,6 +42,10 @@ void __init ramips_soc_prom_init(void)
(char) ((n1 >> 16) & 0xff), (char) ((n1 >> 24) & 0xff),
(id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
(id & CHIP_ID_REV_MASK));
ramips_mem_base = RT305X_SDRAM_BASE;
ramips_mem_size_min = RT305X_MEM_SIZE_MIN;
ramips_mem_size_max = RT305X_MEM_SIZE_MAX;
}
static struct ramips_gpio_chip rt305x_gpio_chips[] = {

4
target/linux/ramips/files/arch/mips/ralink/rt3883/rt3883.c
View File

@@ -41,6 +41,10 @@ void __init ramips_soc_prom_init(void)
(char) ((n1 >> 16) & 0xff), (char) ((n1 >> 24) & 0xff),
(id >> RT3883_REVID_VER_ID_SHIFT) & RT3883_REVID_VER_ID_MASK,
(id & RT3883_REVID_ECO_ID_MASK));
ramips_mem_base = RT3883_SDRAM_BASE;
ramips_mem_size_min = RT3883_MEM_SIZE_MIN;
ramips_mem_size_max = RT3883_MEM_SIZE_MAX;
}
static struct ramips_gpio_chip rt3883_gpio_chips[] = {