aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-01-30 06:58:35 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-01-30 06:58:35 +0000
commit1d1a1c19bfaac7e32e08676bc9e30e4d2d0974e8 (patch)
tree046baef4ebcc9b098be65392d6124f2dfd8173af /target/linux/bcm53xx
parentee7585953345aaae1a52c6818f301fd35bd98c48 (diff)
downloadupstream-1d1a1c19bfaac7e32e08676bc9e30e4d2d0974e8.tar.gz
upstream-1d1a1c19bfaac7e32e08676bc9e30e4d2d0974e8.tar.bz2
upstream-1d1a1c19bfaac7e32e08676bc9e30e4d2d0974e8.zip
bcm53xx: fix booting BCM4709
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 44218
Diffstat (limited to 'target/linux/bcm53xx')
-rw-r--r--target/linux/bcm53xx/patches-3.14/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch23
-rw-r--r--target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch23
2 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch b/target/linux/bcm53xx/patches-3.14/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch
index 2dae1046fe..72f83af2c6 100644
--- a/target/linux/bcm53xx/patches-3.14/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch
+++ b/target/linux/bcm53xx/patches-3.14/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch
@@ -59,6 +59,29 @@ index 0000000..2d7e388
+ 0x88000000 0x08000000>;
+ };
+};
+--- a/arch/arm/mach-bcm/bcm_5301x.c
++++ b/arch/arm/mach-bcm/bcm_5301x.c
+@@ -35,15 +35,16 @@ static struct bcma_bus *bcm5301x_get_bcm
+ static int bcm5301x_abort_handler(unsigned long addr, unsigned int fsr,
+ struct pt_regs *regs)
+ {
+- if (fsr == 0x1c06 && first_fault) {
++ if ((fsr == 0x1406 || fsr == 0x1c06) && first_fault) {
+ first_fault = false;
+
+ /*
+- * These faults with code 0x1c06 happens for no good reason,
+- * possibly left over from the CFE boot loader.
++ * These faults with codes 0x1406 (BCM4709) or 0x1c06 happens
++ * for no good reason, possibly left over from the CFE boot
++ * loader.
+ */
+ pr_warn("External imprecise Data abort at addr=%#lx, fsr=%#x ignored.\n",
+- addr, fsr);
++ addr, fsr);
+
+ /* Returning non-zero causes fault display and panic */
+ return 0;
--
1.8.4.5
diff --git a/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch b/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch
index 2409a04555..a09dbebe43 100644
--- a/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch
+++ b/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch
@@ -59,6 +59,29 @@ index 0000000..2d7e388
+ 0x88000000 0x08000000>;
+ };
+};
+--- a/arch/arm/mach-bcm/bcm_5301x.c
++++ b/arch/arm/mach-bcm/bcm_5301x.c
+@@ -35,15 +35,16 @@ static struct bcma_bus *bcm5301x_get_bcm
+ static int bcm5301x_abort_handler(unsigned long addr, unsigned int fsr,
+ struct pt_regs *regs)
+ {
+- if (fsr == 0x1c06 && first_fault) {
++ if ((fsr == 0x1406 || fsr == 0x1c06) && first_fault) {
+ first_fault = false;
+
+ /*
+- * These faults with code 0x1c06 happens for no good reason,
+- * possibly left over from the CFE boot loader.
++ * These faults with codes 0x1406 (BCM4709) or 0x1c06 happens
++ * for no good reason, possibly left over from the CFE boot
++ * loader.
+ */
+ pr_warn("External imprecise Data abort at addr=%#lx, fsr=%#x ignored.\n",
+- addr, fsr);
++ addr, fsr);
+
+ /* Returning non-zero causes fault display and panic */
+ return 0;
--
1.8.4.5