aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-fix-early-serial-console.patch (renamed from target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch)0
-rw-r--r--target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch (renamed from target/linux/bcm53xx/patches-3.14/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch)0
-rw-r--r--target/linux/bcm53xx/patches-3.14/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch (renamed from target/linux/bcm53xx/patches-3.14/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch)0
-rw-r--r--target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch4
-rw-r--r--target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch2
-rw-r--r--target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-fix-early-serial-console.patch (renamed from target/linux/bcm53xx/patches-3.18/044-ARM-BCM5301X-fix-early-serial-console.patch)0
-rw-r--r--target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch (renamed from target/linux/bcm53xx/patches-3.18/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch)2
-rw-r--r--target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch (renamed from target/linux/bcm53xx/patches-3.18/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch)0
-rw-r--r--target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch (renamed from target/linux/bcm53xx/patches-3.18/049-ARM-BCM53XX-set-customized-AUXCTL.patch)4
9 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch b/target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-fix-early-serial-console.patch
index 5c6f6ec519..5c6f6ec519 100644
--- a/target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch
+++ b/target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-fix-early-serial-console.patch
diff --git a/target/linux/bcm53xx/patches-3.14/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch b/target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
index 887650e4f7..887650e4f7 100644
--- a/target/linux/bcm53xx/patches-3.14/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
+++ b/target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
diff --git a/target/linux/bcm53xx/patches-3.14/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch b/target/linux/bcm53xx/patches-3.14/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
index 0dbb5ce4de..0dbb5ce4de 100644
--- a/target/linux/bcm53xx/patches-3.14/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
+++ b/target/linux/bcm53xx/patches-3.14/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
diff --git a/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch b/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch
index 5948f8727e..a977116a53 100644
--- a/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch
+++ b/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch
@@ -60,8 +60,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
static const char __initconst *bcm5301x_dt_compat[] = {
"brcm,bcm4708",
NULL,
-@@ -55,5 +85,6 @@ DT_MACHINE_START(BCM5301X, "BCM5301X")
- L310_AUX_CTRL_EARLY_BRESP,
+@@ -52,5 +82,6 @@ DT_MACHINE_START(BCM5301X, "BCM5301X")
+ .l2c_aux_val = 0,
.l2c_aux_mask = ~0,
.init_early = bcm5301x_init_early,
+ .restart = bcm5301x_restart,
diff --git a/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch b/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch
index b2e56f8e40..ffe46ec949 100644
--- a/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch
+++ b/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch
@@ -15,7 +15,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
-@@ -2093,7 +2093,10 @@ struct pci_bus *pci_scan_root_bus(struct
+@@ -2097,7 +2097,10 @@ struct pci_bus *pci_scan_root_bus(struct
if (!found)
pci_bus_update_busn_res_end(b, max);
diff --git a/target/linux/bcm53xx/patches-3.18/044-ARM-BCM5301X-fix-early-serial-console.patch b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-fix-early-serial-console.patch
index 4d100dae33..4d100dae33 100644
--- a/target/linux/bcm53xx/patches-3.18/044-ARM-BCM5301X-fix-early-serial-console.patch
+++ b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-fix-early-serial-console.patch
diff --git a/target/linux/bcm53xx/patches-3.18/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch b/target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
index da17347d3e..6b10c8bbf8 100644
--- a/target/linux/bcm53xx/patches-3.18/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
+++ b/target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch
@@ -19,7 +19,7 @@ V2: Don't select GPIOLIB. We may still think about making it default at
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
-@@ -119,6 +119,7 @@ config ARCH_BCM_63XX
+@@ -120,6 +120,7 @@ config ARCH_BCM_63XX
config ARCH_BRCMSTB
bool "Broadcom BCM7XXX based boards" if ARCH_MULTI_V7
depends on MMU
diff --git a/target/linux/bcm53xx/patches-3.18/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch b/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
index 0dbb5ce4de..0dbb5ce4de 100644
--- a/target/linux/bcm53xx/patches-3.18/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
+++ b/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch
diff --git a/target/linux/bcm53xx/patches-3.18/049-ARM-BCM53XX-set-customized-AUXCTL.patch b/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch
index 4367b8b901..60ebbc75fa 100644
--- a/target/linux/bcm53xx/patches-3.18/049-ARM-BCM53XX-set-customized-AUXCTL.patch
+++ b/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch
@@ -14,7 +14,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/arch/arm/mach-bcm/bcm_5301x.c
+++ b/arch/arm/mach-bcm/bcm_5301x.c
-@@ -49,7 +49,10 @@ static const char __initconst *bcm5301x_
+@@ -80,7 +80,10 @@ static const char __initconst *bcm5301x_
};
DT_MACHINE_START(BCM5301X, "BCM5301X")
@@ -25,4 +25,4 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ L310_AUX_CTRL_EARLY_BRESP,
.l2c_aux_mask = ~0,
.init_early = bcm5301x_init_early,
- .dt_compat = bcm5301x_dt_compat,
+ .restart = bcm5301x_restart,