bcm53xx: update BCM5301X SMP patch to fixed version from stblinux

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 47810

diff --git a/target/linux/bcm53xx/patches-4.4/024-ARM-BCM-Add-SMP-support-for-Broadcom-4708.patch b/target/linux/bcm53xx/patches-4.4/024-ARM-BCM-Add-SMP-support-for-Broadcom-4708.patch
index e38b0e528f361b2e8c93e75c10e40fc27be09c4a..8fbc064dbf0c7e94b445d465cf803032bae28ee8 100644 (file)
--- a/target/linux/bcm53xx/patches-4.4/024-ARM-BCM-Add-SMP-support-for-Broadcom-4708.patch
+++ b/target/linux/bcm53xx/patches-4.4/024-ARM-BCM-Add-SMP-support-for-Broadcom-4708.patch
@@ -1,6 +1,6 @@
-From af0783a87a365e87e5ee0ac0ba7e3075abc5007c Mon Sep 17 00:00:00 2001
+From 99498905ac1fbc73a97d27d21ea449fb939072e3 Mon Sep 17 00:00:00 2001
 From: Jon Mason <jonmason@broadcom.com>
-Date: Sat, 5 Dec 2015 06:53:44 -0500
+Date: Tue, 1 Dec 2015 11:24:09 -0500
 Subject: [PATCH] ARM: BCM: Add SMP support for Broadcom 4708
 
 Add SMP support for Broadcom's 4708 SoCs.
@@ -11,34 +11,39 @@ Tested-by: Hauke Mehrtens <hauke@hauke-m.de>
 Signed-off-by: Kapil Hali <kapilh@broadcom.com>
 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 ---
- arch/arm/boot/dts/bcm4708.dtsi | 3 ++-
+ arch/arm/boot/dts/bcm4708.dtsi | 2 ++
  arch/arm/mach-bcm/Kconfig      | 1 +
  arch/arm/mach-bcm/Makefile     | 3 +++
- 3 files changed, 6 insertions(+), 1 deletion(-)
+ 3 files changed, 6 insertions(+)
 
 --- a/arch/arm/boot/dts/bcm4708.dtsi
 +++ b/arch/arm/boot/dts/bcm4708.dtsi
-@@ -27,8 +27,9 @@
+@@ -15,6 +15,7 @@
+       cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
++              enable-method = "brcm,bcm-nsp-smp";
+ 
+               cpu@0 {
+                       device_type = "cpu";
+@@ -27,6 +28,7 @@
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        next-level-cache = <&L2>;
-+                      enable-method = "brcm,bcm-nsp-smp";
 +                      secondary-boot-reg = <0xffff0400>;
                        reg = <0x1>;
                };
        };
--
- };
 --- a/arch/arm/mach-bcm/Kconfig
 +++ b/arch/arm/mach-bcm/Kconfig
-@@ -29,6 +29,7 @@ config ARCH_BCM_IPROC
- config ARCH_BCM_CYGNUS
-       bool "Broadcom Cygnus Support" if ARCH_MULTI_V7
-       select ARCH_BCM_IPROC
+@@ -57,6 +57,7 @@ config ARCH_BCM_5301X
+       select ARM_ERRATA_754322
+       select ARM_ERRATA_775420
+       select ARM_ERRATA_764369 if SMP
 +      select HAVE_SMP
+ 
        help
-         Enable support for the Cygnus family,
-         which includes the following variants:
+         Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores.
 --- a/arch/arm/mach-bcm/Makefile
 +++ b/arch/arm/mach-bcm/Makefile
 @@ -43,6 +43,9 @@ obj-$(CONFIG_ARCH_BCM2835)   += board_bcm2835.o

diff --git a/target/linux/bcm53xx/patches-4.4/299-ARM-BCM-Fix-SMP-in-Kconfig-entries-CYGNUS-and-5301X.patch b/target/linux/bcm53xx/patches-4.4/299-ARM-BCM-Fix-SMP-in-Kconfig-entries-CYGNUS-and-5301X.patch
deleted file mode 100644 (file)
index 9704da8..0000000
--- a/target/linux/bcm53xx/patches-4.4/299-ARM-BCM-Fix-SMP-in-Kconfig-entries-CYGNUS-and-5301X.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Mon, 7 Dec 2015 20:51:32 +0100
-Subject: [PATCH] ARM: BCM: Fix SMP in Kconfig entries CYGNUS and 5301X
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Patch "ARM: BCM: Add SMP support for Broadcom 4708" added symbol in a
-wrong place.
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
- arch/arm/mach-bcm/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/mach-bcm/Kconfig
-+++ b/arch/arm/mach-bcm/Kconfig
-@@ -29,7 +29,6 @@ config ARCH_BCM_IPROC
- config ARCH_BCM_CYGNUS
-       bool "Broadcom Cygnus Support" if ARCH_MULTI_V7
-       select ARCH_BCM_IPROC
--      select HAVE_SMP
-       help
-         Enable support for the Cygnus family,
-         which includes the following variants:
-@@ -58,6 +57,7 @@ config ARCH_BCM_5301X
-       select ARM_ERRATA_754322
-       select ARM_ERRATA_775420
-       select ARM_ERRATA_764369 if SMP
-+      select HAVE_SMP
- 
-       help
-         Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores.