summaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.3/535-svip_cp1.patch
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-08-03 08:53:02 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-08-03 08:53:02 +0000
commitcea2b4210d9b3706cad3cc60cc54dde063e09b58 (patch)
tree81a9746583b2c1c212f8c35a51d07d9353080561 /target/linux/lantiq/patches-3.3/535-svip_cp1.patch
parent6b899d5deac5b0ad531d7a7f2d1d241727848535 (diff)
[lantiq] cleanup patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32953 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.3/535-svip_cp1.patch')
-rw-r--r--target/linux/lantiq/patches-3.3/535-svip_cp1.patch81
1 files changed, 0 insertions, 81 deletions
diff --git a/target/linux/lantiq/patches-3.3/535-svip_cp1.patch b/target/linux/lantiq/patches-3.3/535-svip_cp1.patch
deleted file mode 100644
index 84b483b6f..000000000
--- a/target/linux/lantiq/patches-3.3/535-svip_cp1.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Index: linux-3.3.8/arch/mips/lantiq/devices.c
-===================================================================
---- linux-3.3.8.orig/arch/mips/lantiq/devices.c 2012-07-31 09:45:42.315551926 +0200
-+++ linux-3.3.8/arch/mips/lantiq/devices.c 2012-07-31 09:46:14.051553281 +0200
-@@ -102,19 +102,29 @@
- }
- #endif
-
-+#ifdef CONFIG_SOC_SVIP
-+extern unsigned int *prom_cp1_base;
-+#else
- static unsigned int *cp1_base = 0;
-+#endif
- unsigned int*
- ltq_get_cp1_base(void)
- {
-+#ifdef CONFIG_SOC_SVIP
-+ return prom_cp1_base;
-+#else
- return cp1_base;
-+#endif
- }
- EXPORT_SYMBOL(ltq_get_cp1_base);
-
- void __init
- ltq_register_tapi(void)
- {
-+#ifndef CONFIG_SOC_SVIP
- #define CP1_SIZE (1 << 20)
- dma_addr_t dma;
- cp1_base =
- (void*)CPHYSADDR(dma_alloc_coherent(NULL, CP1_SIZE, &dma, GFP_ATOMIC));
-+#endif
- }
-Index: linux-3.3.8/arch/mips/lantiq/prom.c
-===================================================================
---- linux-3.3.8.orig/arch/mips/lantiq/prom.c 2012-07-31 09:45:42.315551926 +0200
-+++ linux-3.3.8/arch/mips/lantiq/prom.c 2012-07-31 10:31:28.759669332 +0200
-@@ -129,6 +129,7 @@
- }
- EXPORT_SYMBOL(ltq_remap_resource);
-
-+
- void __init prom_init(void)
- {
- ltq_soc_detect(&soc_info);
-Index: linux-3.3.8/arch/mips/lantiq/setup.c
-===================================================================
---- linux-3.3.8.orig/arch/mips/lantiq/setup.c 2012-07-31 09:45:42.315551926 +0200
-+++ linux-3.3.8/arch/mips/lantiq/setup.c 2012-07-31 10:31:35.215669606 +0200
-@@ -21,8 +21,15 @@
- /* set to 1 if the bootloader is BRN-BOOT instead of u-boot */
- unsigned long ltq_brn_boot = 0;
-
-+#ifdef CONFIG_SOC_SVIP
-+unsigned int *prom_cp1_base;
-+#endif
-+
- void __init plat_mem_setup(void)
- {
-+#ifdef CONFIG_SOC_SVIP
-+ int prom_cp1_size = 0x800000;
-+#endif
- /* assume 16M as default incase uboot fails to pass proper ramsize */
- unsigned long memsize = 16;
- char **envp = (char **) KSEG1ADDR(fw_arg2);
-@@ -54,6 +61,14 @@
- envp++;
- }
- memsize *= 1024 * 1024;
-+
-+#ifdef CONFIG_SOC_SVIP
-+ memsize -= prom_cp1_size;
-+ prom_cp1_base = (unsigned int *)KSEG1ADDR(memsize);
-+
-+ printk("Using %ldMB Ram and reserving %dMB for cp1\n",
-+ memsize>>20, prom_cp1_size>>20);
-+#endif
- add_memory_region(0x00000000, memsize, BOOT_MEM_RAM);
- }
-