summaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/files/arch/mips/include/asm
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-11 19:05:56 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-11 19:05:56 +0000
commit5a2708d1926dfdbbe91f5d12fab43eff55ea971f (patch)
treee6992194aa267fc8e67bdb1985860631c687d7c0 /target/linux/ramips/files/arch/mips/include/asm
parent9fb8ca891c66f6f2eff5d3003c9ca3b306fb062a (diff)
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/include/asm')
-rw-r--r--target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h3
-rw-r--r--target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h3
-rw-r--r--target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x/ralink_soc.h18
-rw-r--r--target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x/ralink_soc.h18
-rw-r--r--target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt3883/ralink_soc.h18
5 files changed, 6 insertions, 54 deletions
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h
index 7be24f7af..111dd0640 100644
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h
+++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h
@@ -11,6 +11,9 @@
#define RAMIPS_SYS_TYPE_LEN 64
extern unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN];
+extern unsigned long ramips_mem_base;
+extern unsigned long ramips_mem_size_min;
+extern unsigned long ramips_mem_size_max;
void ramips_intc_irq_init(unsigned intc_base, unsigned irq, unsigned irq_base);
u32 ramips_intc_get_status(void);
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
index ff6c82ec8..10d726332 100644
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
+++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
@@ -17,6 +17,9 @@
#include <linux/init.h>
#include <linux/io.h>
+#define RT288X_MEM_SIZE_MIN (2 * 1024 * 1024)
+#define RT288X_MEM_SIZE_MAX (128 * 1024 * 1024)
+
#define RT288X_CPU_IRQ_BASE 0
#define RT288X_INTC_IRQ_BASE 8
#define RT288X_INTC_IRQ_COUNT 32
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x/ralink_soc.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x/ralink_soc.h
deleted file mode 100644
index 73301e239..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x/ralink_soc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Ralink RT288x specific SOC defines
- *
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#ifndef __RT288X_RALINK_SOC_H
-#define __RT288X_RALINK_SOC_H
-
-#define RALINK_SOC_SDRAM_BASE 0x08000000
-#define RALINK_SOC_MEM_SIZE_MIN (2 * 1024 * 1024)
-#define RALINK_SOC_MEM_SIZE_MAX (128 * 1024 * 1024)
-
-#endif /* __RT288X_RALINK_SOC_H */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x/ralink_soc.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x/ralink_soc.h
deleted file mode 100644
index c3206ec13..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x/ralink_soc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Ralink RT305x specific SOC defines
- *
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#ifndef __RT288X_RALINK_SOC_H
-#define __RT288X_RALINK_SOC_H
-
-#define RALINK_SOC_SDRAM_BASE 0
-#define RALINK_SOC_MEM_SIZE_MIN (2 * 1024 * 1024)
-#define RALINK_SOC_MEM_SIZE_MAX (64 * 1024 * 1024)
-
-#endif /* __RT288X_RALINK_SOC_H */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt3883/ralink_soc.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt3883/ralink_soc.h
deleted file mode 100644
index 8a080b7d2..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt3883/ralink_soc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Ralink RT3662/RT3883 specific SOC defines
- *
- * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#ifndef _RT3883_RALINK_SOC_H
-#define _RT3883_RALINK_SOC_H
-
-#define RALINK_SOC_SDRAM_BASE 0
-#define RALINK_SOC_MEM_SIZE_MIN (2 * 1024 * 1024)
-#define RALINK_SOC_MEM_SIZE_MAX (256 * 1024 * 1024)
-
-#endif /* _RT3883_RALINK_SOC_H */