diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-11-23 14:08:41 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-11-23 14:08:41 +0000 |
| commit | 40b5fad48db0783148656a2051409d3f8f86ddc9 (patch) | |
| tree | f8487bb469249a5bbb46cd63f896e46c92a75277 /target/linux/brcm47xx | |
| parent | 60cbd62791204edb9a3907710c526974eb99c203 (diff) | |
| download | upstream-40b5fad48db0783148656a2051409d3f8f86ddc9.tar.gz upstream-40b5fad48db0783148656a2051409d3f8f86ddc9.tar.bz2 upstream-40b5fad48db0783148656a2051409d3f8f86ddc9.zip | |
linux/brcm47xx: Broadcom BCM4710 does not belong in the BMIPS4KC family.
SVN-Revision: 24112
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch | 2 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch index 18d28665ab..d791c7a1fb 100644 --- a/target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch @@ -319,7 +319,7 @@ + /* Check if special workarounds are required */ +#ifdef CONFIG_BCM47XX -+ if (current_cpu_data.cputype == CPU_BMIPS4KC && (current_cpu_data.processor_id & 0xff) == 0) { ++ if (current_cpu_data.cputype == CPU_BCM4710 && (current_cpu_data.processor_id & 0xff) == 0) { + printk("Enabling BCM4710A0 cache workarounds.\n"); + bcm4710 = 1; + } else diff --git a/target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch index d9866dc9e4..fb3dd60962 100644 --- a/target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch +++ b/target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch @@ -34,7 +34,7 @@ --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -711,6 +711,9 @@ build_get_pgde32(u32 **p, unsigned int t +@@ -712,6 +712,9 @@ build_get_pgde32(u32 **p, unsigned int t #endif uasm_i_addu(p, ptr, tmp, ptr); #else @@ -44,7 +44,7 @@ UASM_i_LA_mostly(p, ptr, pgdc); #endif uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */ -@@ -872,12 +875,12 @@ static void __cpuinit build_r4000_tlb_re +@@ -873,12 +876,12 @@ static void __cpuinit build_r4000_tlb_re /* No need for uasm_i_nop */ } @@ -60,7 +60,7 @@ build_get_pgde32(&p, K0, K1); /* get pgd in K1 */ #endif -@@ -889,6 +892,9 @@ static void __cpuinit build_r4000_tlb_re +@@ -890,6 +893,9 @@ static void __cpuinit build_r4000_tlb_re build_update_entries(&p, K0, K1); build_tlb_write_entry(&p, &l, &r, tlb_random); uasm_l_leave(&l, p); @@ -70,7 +70,7 @@ uasm_i_eret(&p); /* return from trap */ #ifdef CONFIG_HUGETLB_PAGE -@@ -1325,12 +1331,12 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -1326,12 +1332,12 @@ build_r4000_tlbchange_handler_head(u32 * struct uasm_reloc **r, unsigned int pte, unsigned int ptr) { @@ -86,7 +86,7 @@ build_get_pgde32(p, pte, ptr); /* get pgd in ptr */ #endif -@@ -1367,6 +1373,9 @@ build_r4000_tlbchange_handler_tail(u32 * +@@ -1368,6 +1374,9 @@ build_r4000_tlbchange_handler_tail(u32 * build_update_entries(p, tmp, ptr); build_tlb_write_entry(p, l, r, tlb_indexed); uasm_l_leave(l, *p); |